Skip to content

add SYSCONFDIR variable to allow FHS-compliant builds #210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Gemba merged 1 commit into from
Jan 18, 2026
Merged

add SYSCONFDIR variable to allow FHS-compliant builds #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions skyscraper.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,12 @@ isEmpty(PREFIX) {
PREFIX = /usr/local
}

# System configuration directory
SYSCONFDIR = $$(SYSCONFDIR)
isEmpty(SYSCONFDIR) {
SYSCONFDIR = $${PREFIX}/etc
}

unix:target.path=$${PREFIX}/bin
unix:target.files=Skyscraper Skyscraper.app/Contents/MacOS/Skyscraper

Expand All @@ -39,25 +45,25 @@ unix:supplementary.files=\
supplementary/scraperdata/peas_and_idmap_verify.py \
supplementary/scraperdata/README-Skyscraper-Scripts.md

unix:config.path=$${PREFIX}/etc/skyscraper
unix:config.path=$${SYSCONFDIR}/skyscraper
unix:config.files=aliasMap.csv hints.xml mameMap.csv \
mobygames_platforms.json peas.json platforms_idmap.csv \
screenscraper_platforms.json tgdb_developers.json \
tgdb_genres.json tgdb_platforms.json tgdb_publishers.json

unix:examples.path=$${PREFIX}/etc/skyscraper
unix:examples.path=$${SYSCONFDIR}/skyscraper
unix:examples.files=config.ini.example README.md artwork.xml \
artwork.xml.example1 artwork.xml.example2 artwork.xml.example3 \
artwork.xml.example4 batocera-artwork.xml docs/ARTWORK.md docs/CACHE.md

unix:cacheexamples.path=$${PREFIX}/etc/skyscraper/cache
unix:cacheexamples.path=$${SYSCONFDIR}/skyscraper/cache
unix:cacheexamples.files=cache/priorities.xml.example docs/CACHE.md

unix:impexamples.path=$${PREFIX}/etc/skyscraper/import
unix:impexamples.path=$${SYSCONFDIR}/skyscraper/import
unix:impexamples.files=docs/IMPORT.md import/definitions.dat.example1 \
import/definitions.dat.example2

unix:resexamples.path=$${PREFIX}/etc/skyscraper/resources
unix:resexamples.path=$${SYSCONFDIR}/skyscraper/resources
unix:resexamples.files=resources/maskexample.png resources/frameexample.png \
resources/boxfront.png resources/boxside.png resources/scanlines1.png \
resources/scanlines2.png
Expand All @@ -73,6 +79,7 @@ unix:count(dev, 1) {
}
DEFINES+=VERSION=\\\"$$VERSION\\\"
DEFINES+=PREFIX=\\\"$$PREFIX\\\"
DEFINES+=SYSCONFDIR=\\\"$$SYSCONFDIR\\\"

CONFIG(release, debug|release):DEFINES += QT_NO_DEBUG_OUTPUT

Expand Down
4 changes: 2 additions & 2 deletions src/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ void Config::setupUserConfig() {
}
}

QString localEtcPath = QString(PREFIX "/etc/skyscraper/");
QString localEtcPath = QString(SYSCONFDIR "/skyscraper/");
if (!QFileInfo::exists(localEtcPath) || isRpInstall) {
// RetroPie or Windows installation type: handled externally
return;
Expand Down Expand Up @@ -391,4 +391,4 @@ const char *Config::pathToCStr(QString &in) {
ret = ret.replace(QDir::homePath(), "~");
#endif
return ret.toUtf8().constData();
}
}
Loading