From 4ede76fb6a5ba81b92b0e3452e954d9eea431a74 Mon Sep 17 00:00:00 2001 From: Jim Pryor Date: Tue, 11 Aug 2009 08:04:50 -0400 Subject: Add contrib dir and logging hooks * Add contrib/logging.hook * Update Makefile and manpage * Propose that hooks go into /etc, not /usr---latter should be shareable and possibly read-only, not good spot for user-configurable files like these. * Since we have hooks/arch as part of the package, this commit attempts to load hooks from both /usr/lib/network/hooks and /etc/network.d/hooks. (Executable hooks in /etc take precedence over hooks with same name from /usr.) * Need to load /etc/rc.conf before /etc/rc.d/functions (e.g. for USECOLORS) Signed-off-by: Jim Pryor --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 4744bc2..9220b5d 100644 --- a/Makefile +++ b/Makefile @@ -4,6 +4,7 @@ VPATH = doc install: install -d $(DESTDIR)/usr/lib/network/{connections,hooks} $(DESTDIR)/etc/network.d/examples \ + $(DESTDIR)/etc/network.d/hooks \ $(DESTDIR)/var/run/network/{interfaces,profiles} \ $(DESTDIR)/usr/bin/ $(DESTDIR)/etc/rc.d/ \ $(DESTDIR)/usr/share/man/{man5,man8} \ @@ -31,8 +32,9 @@ install-wireless: install -m755 src-wireless/net-auto $(DESTDIR)/etc/rc.d install-docs: docs - install -d $(DESTDIR)/usr/share/doc/netcfg + install -d $(DESTDIR)/usr/share/doc/netcfg/contrib install -m644 doc/*html $(DESTDIR)/usr/share/doc/netcfg/ + install -m644 contrib/* $(DESTDIR)/usr/share/doc/netcfg/contrib/ docs: doc/* for doc in $(?); do \ @@ -42,7 +44,7 @@ docs: doc/* tarball: sed -i "s/NETCFG_VER=.*/NETCFG_VER=$(VERSION)/g" src/netcfg mkdir -p netcfg-$(VERSION) - cp -r src src-wireless examples man Makefile LICENSE README netcfg-$(VERSION) + cp -r src src-wireless examples contrib man Makefile LICENSE README netcfg-$(VERSION) tar -zcvf netcfg-$(VERSION).tar.gz netcfg-$(VERSION) mv netcfg-$(VERSION).tar.gz ../ rm -rf netcfg-$(VERSION) -- cgit v1.2.3-24-g4f1b