summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRémy Oudompheng <remy@archlinux.org>2011-06-19 22:40:03 +0200
committerRémy Oudompheng <remy@archlinux.org>2011-06-19 22:40:03 +0200
commitf86ca4d5aba7550d2d7800d350636314be0a08c9 (patch)
tree5c1544e32df5252c6b95de71570bba275f6c6fb1
parent709c4247e3c3fd69612843c1e707d08c4ab8d3bf (diff)
downloadnetctl-f86ca4d5aba7550d2d7800d350636314be0a08c9.tar.gz
netctl-f86ca4d5aba7550d2d7800d350636314be0a08c9.tar.xz
Rationalize Makefile
Signed-off-by: Rémy Oudompheng <remy@archlinux.org>
-rw-r--r--Makefile14
1 files changed, 7 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 8e8dff6..54f01d6 100644
--- a/Makefile
+++ b/Makefile
@@ -5,18 +5,16 @@ VPATH = doc
.PHONY: install docs
install:
- install -d $(DESTDIR)/usr/lib/network/{connections,hooks} \
- $(DESTDIR)/etc/network.d/{examples,hooks,interfaces} \
- $(DESTDIR)/etc/rc.d \
- $(DESTDIR)/usr/share/man/{man5,man8} \
- install -d $(DESTDIR)/lib/systemd/system
# Configuration files
- install -m644 config/netcfg $(DESTDIR)/etc/conf.d/netcfg
+ install -d $(DESTDIR)/etc/network.d/{examples,hooks,interfaces}
+ install -D -m644 config/netcfg $(DESTDIR)/etc/conf.d/netcfg
install -m644 config/iftab $(DESTDIR)/etc/iftab
- # Documentation
install -m644 docs/examples/* $(DESTDIR)/etc/network.d/examples/
+ # Documentation
+ install -d $(DESTDIR)/usr/share/man/man8
install -m644 docs/man/*.8 $(DESTDIR)/usr/share/man/man8
# Libs
+ install -d $(DESTDIR)/usr/lib/network/{connections,hooks}
install -m644 src/{network,rfkill,8021x,globals} $(DESTDIR)/usr/lib/network
install -m755 src/connections/* $(DESTDIR)/usr/lib/network/connections
ln -s wireless $(DESTDIR)/usr/lib/network/connections/wireless-dbus
@@ -30,7 +28,9 @@ install:
install -m755 wpa_actiond/netcfg-wpa_actiond{,-action} ifplugd/net-auto-wired $(DESTDIR)/usr/bin
install -Dm755 ifplugd/netcfg.action $(DESTDIR)/etc/ifplugd/netcfg.action
# Daemons
+ install -d $(DESTDIR)/etc/rc.d
install -m755 scripts/net-{profiles,rename} wpa_actiond/net-auto-wireless ifplugd/net-auto-wired $(DESTDIR)/etc/rc.d
+ install -d $(DESTDIR)/lib/systemd/system
install -m644 wpa_actiond/net-auto-wireless.service ifplugd/net-auto-wired.service $(DESTDIR)/lib/systemd/system
# Shell Completion
install -Dm644 contrib/bash-completion $(DESTDIR)/etc/bash_completion.d/netcfg