Install our autostart files into /etc/xdg/autostart
authorRoy Marples <roy@marples.name>
Thu, 18 Sep 2014 10:38:36 +0000 (10:38 +0000)
committerRoy Marples <roy@marples.name>
Thu, 18 Sep 2014 10:38:36 +0000 (10:38 +0000)
configure
src/dhcpcd-gtk/Makefile
src/dhcpcd-qt/dhcpcd-qt.pro

index 535d58a9c9556da339591fcc5494008d9069b6b4..dcb3dbc76f722eb0a890012e52927f9447b40eb1 100755 (executable)
--- a/configure
+++ b/configure
@@ -418,7 +418,8 @@ echo
 echo "MKDIR=           \${TOPDIR}/mk" >>$CONFIG_MK
 
 if $DHCPCD_QT; then
-       QMAKE_CONFIG="$QMAKE_CONFIG PREFIX=$PREFIX MANDIR=$MANDIR"
+       QMAKE_CONFIG="$QMAKE_CONFIG PREFIX=$PREFIX SYSCONFDIR=$SYSCONFDIR"
+       QMAKE_CONFIG="$QMAKE_CONFIG MANDIR=$MANDIR"
        if ! (cd src/dhcpcd-qt; qmake $QMAKE_CONFIG dhcpcd-qt.pro); then
                echo "$0: failed to configure dhcpcd-qt" >&2
                exit 1
index c9c57b2169265866d6260aa25f80407f6190e6a1..3652970a094b3acb713229244de0d0052eb375f2 100644 (file)
@@ -6,7 +6,7 @@ include ${TOPDIR}/iconfig.mk
 
 ICONDIR?=      ${PREFIX}/share/dhcpcd/icons
 APPDIR?=       ${PREFIX}/share/applications
-AUTOSTARTDIR?= ${PREFIX}/share/gnome/autostart
+AUTOSTARTDIR?= ${SYSCONFDIR}/xdg/autostart
 FILESDIR=      ${APPDIR}
 FILES=         dhcpcd-gtk.desktop
 FILESDIR2=     ${AUTOSTARTDIR}
index fea86bec5a529bf3cdf026615f82b803ca0bc53a..9b3daf7237da5a7e7fd83583bd6daa0785cd9439 100644 (file)
@@ -23,6 +23,9 @@ QMAKE_CLEAN+=         ${TARGET}
 isEmpty(PREFIX) {
        PREFIX=         /usr/local
 }
+isEmpty(SYSCONFDIR)
+       SYSCONFDIR=     $$PREFIX/etc
+}
 isEmpty(MANDIR) {
        MANDIR=         $$PREFIX/share/man
 }
@@ -35,7 +38,7 @@ man8.files=           dhcpcd-qt.8
 desktop.path=          $$PREFIX/share/applications
 desktop.files=         dhcpcd-qt.desktop
 
-autostart.path=                $$PREFIX/share/autostart
+autostart.path=                $$SYSCONFDIR/xdg/autostart
 autostart.files=       dhcpcd-qt.desktop
 
 INSTALLS+=             target man8 desktop autostart