applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-30 19:05:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #106 from plfiorini/settingsconf

Browse source 
Try to find settings.conf from SYSCONFDIR
This commit is contained in:
Teo Mrnjavac 2014-08-20 14:34:54 +02:00
commit b51cfd6a45
3 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/calamares/CalamaresApplication.cpp
View file

@ -18,6 +18,7 @@
#include <QDesktopWidget>
#include "CalamaresApplication.h"
#include "CalamaresConfig.h"
#include "CalamaresWindow.h"
#include "CalamaresVersion.h"
#include "progresstree/ProgressTreeView.h"
@ -156,7 +157,7 @@ CalamaresApplication::initSettings()
QDir::separator() +
"settings.conf" );
}
settingsFileCandidatesByPriority.append( "/etc/calamares/settings.conf" );
settingsFileCandidatesByPriority.append( CMAKE_INSTALL_FULL_SYSCONFDIR "/calamares/settings.conf" );
settingsFileCandidatesByPriority.append( CalamaresUtils::appDataDir()
.absoluteFilePath( "settings.conf" ) );

1
src/libcalamares/CalamaresConfig.h.in
View file

@ -6,6 +6,7 @@
#define CMAKE_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}"
#define CMAKE_INSTALL_FULL_LIBDIR "${CMAKE_INSTALL_FULL_LIBDIR}"
#define CMAKE_INSTALL_FULL_DATADIR "${CMAKE_INSTALL_FULL_DATADIR}/calamares"
#define CMAKE_INSTALL_FULL_SYSCONFDIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}"
//cmakedefines for CMake variables (e.g. for optdepends) go here
#cmakedefine WITH_PYTHON