diff options
| author | Jim Pryor <profjim@jimpryor.net> | 2009-08-11 14:04:50 +0200 |
|---|---|---|
| committer | James Rayner <james@archlinux.org> | 2009-08-15 04:28:25 +0200 |
| commit | 4ede76fb6a5ba81b92b0e3452e954d9eea431a74 (patch) | |
| tree | 35a778707c544d6604a01aca3027df4924408f8a /Makefile | |
| parent | 4ebad5f88abda1b0788ef7ad3cd46d8cd8cfa6d7 (diff) | |
| download | netctl-4ede76fb6a5ba81b92b0e3452e954d9eea431a74.tar.gz netctl-4ede76fb6a5ba81b92b0e3452e954d9eea431a74.tar.xz | |
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 <profjim@jimpryor.net>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -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) |