Fix install
authorRoy Marples <roy@marples.name>
Tue, 16 Sep 2014 16:22:38 +0000 (16:22 +0000)
committerRoy Marples <roy@marples.name>
Tue, 16 Sep 2014 16:22:38 +0000 (16:22 +0000)
Makefile
configure
mk/files.mk
mk/prog.mk
src/dhcpcd-gtk/Makefile

index 7a4ed6be4d016ba465f988a53bd7021ff5de1d7f..2d4be6a05cdd79c2234d805097993ae5861cfae4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ include ${MKDIR}/subdir.mk
 
 .PHONY:                icons
 
-SUBDIR=                src ${ICONS}
+SUBDIR=                src ${MKICONS}
 
 GITREF?=       HEAD
 DISTPREFIX?=   ${PROG}-${VERSION}
index 6932778edf9bab05a3040169563b4a2a2e47ba21..fece384e2865ad943e428e742f29ac21182944a8 100755 (executable)
--- a/configure
+++ b/configure
@@ -366,7 +366,7 @@ elif [ -n "$WITH_QT" -a "$WITH_QT" != no ]; then
 fi
 
 if [ -n "$UI" ]; then
-       echo "ICONS=            icons" >>$CONFIG_MK
+       echo "MKICONS=          icons" >>$CONFIG_MK
 fi
 echo "UI=              $UI" >>$CONFIG_MK
 
index 0682b0346598c134e2c8187ecddd0e27538dbf2d..8e418e575e712d8919675bc0f232d7bbaf8f8f8f 100644 (file)
@@ -4,6 +4,8 @@
 FILESDIR?=     ${BINDIR}
 FILESMODE?=    ${NONBINMODE}
 
+FILESINSTALL=  _filesinstall
+
 _filesinstall:
        ${INSTALL} -d ${DESTDIR}${FILESDIR}
        ${INSTALL} -m ${FILESMODE} ${FILES} ${DESTDIR}${FILESDIR}
index 38d91b189c2b114313e8c4f971b515d218cc75d1..18679d4fdfefa10401570008c031e5acf8583610 100644 (file)
@@ -20,10 +20,9 @@ proginstall: ${PROG}
 
 include ${MKDIR}/sys.mk
 include ${MKDIR}/depend.mk
-include ${MKDIR}/files.mk
 include ${MKDIR}/man.mk
 
-install: proginstall _filesinstall _maninstall
+install: proginstall ${FILESINSTALL} _maninstall
 
 clean:
        rm -f ${OBJS} ${PROG} ${PROG}.core ${CLEANFILES}
index 75eec7d3341755e7943706443886a14d81bad4cd..3f070588d4460751a2399b595f45f3059bbb1699 100644 (file)
@@ -18,4 +18,7 @@ LDADD+=               ${LIB_DHCPCD} ${GTK_LIBS}
 .PHONY: dhcpcd-gtk
 
 include ../libdhcpcd/Makefile.inc
+
+FILESINSTALL=  _filesinstall
 include ${MKDIR}/prog.mk
+include ${MKDIR}/files.mk