Change our Makefile vars to be more like NetBSD.

diff --git a/Makefile b/Makefile
index e766368f159584f0eeec2422d612b0d3adf70f21..9e73c1c8a7f75666056e95c93985051b87e6a4b0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,14 +6,19 @@ PROG=         dhcpcd
 SRCS=          common.c dhcp.c dhcpcd.c logger.c net.c signals.c
 SRCS+=         configure.c client.c
 SRCS+=         ${SRC_IF} ${SRC_SOCKET}
-SCRIPT=                dhcpcd.sh
-CONF=          dhcpcd.conf
-MAN5=          dhcpcd.conf.5
-MAN8=          dhcpcd.8 dhcpcd.sh.8
-CLEANFILES=    dhcpcd.sh dhcpcd.conf.5 dhcpcd.8 dhcpcd.sh.8
 
 BINDIR=                ${PREFIX}/sbin
-SYSCONFDIR?=   ${PREFIX}/etc/${PROG}
+SYSCONFDIR?=   ${PREFIX}/etc/dhcpcd
+
+MAN=           dhcpcd.conf.5 dhcpcd.8 dhcpcd.sh.8
+CLEANFILES=    dhcpcd.conf.5 dhcpcd.8 dhcpcd.sh.8
+
+SCRIPTS=       dhcpcd.sh
+SCRIPTSDIR=    ${SYSCONFDIR}
+CLEANFILES+=   dhcpcd.sh
+
+FILES=         dhcpcd.conf
+FILESDIR=      ${SYSCONFDIR}
 
 .SUFFIXES:     .in .sh.in
 
@@ -29,4 +34,3 @@ LDADD+=               ${LIBRT}
 
 .sh.in.sh:
        ${SED} 's:@SYSCONFDIR@:${SYSCONFDIR}:g' $< > $@
-

diff --git a/mk/files.mk b/mk/files.mk
new file mode 100644 (file)
index 0000000..a2f9038
--- /dev/null
+++ b/mk/files.mk
@@ -0,0 +1,9 @@
+# Quick and dirty files
+# Copyright 2008 Roy Marples <roy@marples.name>
+
+FILESDIR?=     ${BINDIR}
+FILESMODE?=    ${NONBINMODE}
+
+_filesinstall:
+       ${INSTALL} -d ${DESTDIR}${FILESIR}
+       ${INSTALL} -m ${FILESMODE} ${FILES} ${DESTDIR}${FILESDIR}

diff --git a/mk/man.mk b/mk/man.mk
index f48f55050f670316b5df720ede9b60f537e36091..1b43611ba6f2f09e2f8597a9b1596fa7853813dd 100644 (file)
--- a/mk/man.mk
+++ b/mk/man.mk
@@ -5,9 +5,17 @@ MANPREFIX?=    /usr/share
 MANDIR?=       ${MANPREFIX}/man/man
 MANMODE?=      0444
 
-man: ${MAN5} ${MAN8}
+_MAN5_SH=      for man in ${MAN}; do case $$man in *.5) echo $$man;; esac; done
+_MAN5!=                ${_MAN5_SH}
+MAN5=          ${_MAN5}$(shell ${_MAN5_SH}
 
-maninstall: man
+_MAN8_SH=      for man in ${MAN}; do case $$man in *.8) echo $$man;; esac; done
+_MAN8!=                ${_MAN8_SH}
+MAN8=          ${_MAN8}$(shell ${_MAN8_SH}
+
+_man: ${MAN}
+
+_maninstall: _man
        ${INSTALL} -d ${DESTDIR}${MANDIR}5
        ${INSTALL} -m ${MANMODE} ${MAN5} ${DESTDIR}${MANDIR}5
        ${INSTALL} -d ${DESTDIR}${MANDIR}8

diff --git a/mk/prog.mk b/mk/prog.mk
index dc9bdf222b166c5af674b558cac21d551f2b53dc..80e846ede10c34df64f133dcf9333eaa1213dd13 100644 (file)
--- a/mk/prog.mk
+++ b/mk/prog.mk
@@ -8,15 +8,15 @@ include ${MK}/os.mk
 
 BINDIR?=       ${PREFIX}/usr/bin
 BINMODE?=      0755
+NONBINMODE?=   0644
 OBJS+=         ${SRCS:.c=.o}
 
-CONFMODE?=     0644
 SYSCONFDIR?=   ${PREFIX}/etc
 
 INSTALL?=      install
 SED?=          sed
 
-all: ${PROG} ${SCRIPT} man
+all: ${PROG} ${SCRIPTS} _man
 
 ${PROG}: ${OBJS}
        ${CC} ${LDFLAGS} -o $@ ${OBJS} ${LDADD}
@@ -34,19 +34,13 @@ _proginstall: ${PROG}
        ${INSTALL} -m ${BINMODE} ${PROG} ${DESTDIR}${BINDIR}
        ${INSTALL} -d ${DESTDIR}${INFODIR}
 
-_scriptinstall: ${SCRIPT}
-       ${INSTALL} -d ${DESTDIR}${SYSCONFDIR}
-       ${INSTALL} -m ${BINMODE} ${SCRIPT} ${DESTDIR}${SYSCONFDIR}
-
-_confinstall: ${CONF}
-       ${INSTALL} -d ${DESTDIR}${SYSCONFDIR}
-       ${INSTALL} -m ${CONFMODE} ${CONF} ${DESTDIR}${SYSCONFDIR}
-
 include ${MK}/depend.mk
+include ${MK}/files.mk
+include ${MK}/scripts.mk
 include ${MK}/man.mk
 include ${MK}/dist.mk
 
-install: _proginstall _scriptinstall _confinstall maninstall
+install: _proginstall _scriptsinstall _filesinstall _maninstall
 
 clean:
        rm -f ${OBJS} ${PROG} _${PROG}.c _${PROG}.o ${CLEANFILES}

diff --git a/mk/scripts.mk b/mk/scripts.mk
new file mode 100644 (file)
index 0000000..c8fa679
--- /dev/null
+++ b/mk/scripts.mk
@@ -0,0 +1,9 @@
+# Quick and dirty scripts
+# Copyright 2008 Roy Marples <roy@marples.name>
+
+SCRIPTSDIR?=   ${BINDIR}
+SCRIPTSMODE?=  ${BINMODE}
+
+_scriptsinstall:
+       ${INSTALL} -d ${DESTDIR}${SCRIPTSDIR}
+       ${INSTALL} -m ${SCRIPTSMODE} ${SCRIPTS} ${DESTDIR}${FILESDIR}