Make it possible just to package the icons.
authorRoy Marples <roy@marples.name>
Wed, 17 Sep 2014 10:10:45 +0000 (10:10 +0000)
committerRoy Marples <roy@marples.name>
Wed, 17 Sep 2014 10:10:45 +0000 (10:10 +0000)
configure
src/Makefile

index 1e0220a9cd787e40974dee0a5c64172bf7ac0db9..c621950d772643d152261fc31973068a6a055166 100755 (executable)
--- a/configure
+++ b/configure
@@ -43,6 +43,8 @@ for x; do
        --without-gtk|--without-gtk+) WITH_GTK=no;;
        --with-qt) WITH_QT=${var:-yes};;
        --without-qt) WITH_QT=no;;
+       --with-icons) WITH_ICONS=${var:-yes};;
+       --without-icons) WITH_ICONS=no;;
        --enable-notification) NOTIFY=yes;;
        --disable-notification) NOTIFY=no;;
        --help) echo "See the README file for available options"; exit 0;;
@@ -369,14 +371,14 @@ elif [ -n "$WITH_QT" -a "$WITH_QT" != no ]; then
        fi
 fi
 
-if [ -n "$UI" ]; then
+if [ -n "$UI" -o "$WITH_ICONS" = yes ]; then
        echo "MKICONS=  icons" >>$CONFIG_MK
 fi
 
 if [ -n "$WITH_DHCPCD_ONLINE" -a "$WITH_DHCPCD_ONLINE" != no ]; then
        UI="dhcpcd-online${UI:+ }$UI"
 fi
-echo "UI=              $UI" >>$CONFIG_MK
+echo "UI=              ${UI:+libdhcpcd }$UI" >>$CONFIG_MK
 
 echo
 echo "   SYSCONFDIR =          $SYSCONFDIR"
index cf96e6292ee2238685eb469e5a226a7d49f035ba..12c5f85967dad7dc4518f15b66eb22db6fbe8290 100644 (file)
@@ -1,6 +1,6 @@
 TOPDIR=                ..
 include ${TOPDIR}/iconfig.mk
 
-SUBDIR=                libdhcpcd ${UI}
+SUBDIR=                ${UI}
 
 include ${MKDIR}/subdir.mk