From 4e457e0efd0e5fd5df24c7e9ed63b02d0196ea8d Mon Sep 17 00:00:00 2001
From: Jouke Witteveen <j.witteveen@gmail.com>
Date: Fri, 28 Dec 2012 02:38:58 +0100
Subject: Forking netcfg to netctl (1/2)

This commit contains the moving of files.
---
 Makefile | 73 +++++++++++++++++++++++-----------------------------------------
 1 file changed, 26 insertions(+), 47 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 023ed64..8d22397 100644
--- a/Makefile
+++ b/Makefile
@@ -1,74 +1,53 @@
-export VERSION = 3.1
+export VERSION = 0.1
 
-.PHONY: install install-docs docs tarball pkgbuild upload clean
+.PHONY: install install-docs docs tarball pkgbuild clean
 
 install: install-docs
 	# Configuration files
-	install -d $(DESTDIR)/etc/network.d/{examples,interfaces}
-	install -Dm644 config/netcfg $(DESTDIR)/etc/conf.d/netcfg
-	install -m644 config/iftab $(DESTDIR)/etc/iftab
+	install -d $(DESTDIR)/etc/network.d/{examples,hooks,interfaces}
 	install -m644 docs/examples/* $(DESTDIR)/etc/network.d/examples/
 	# 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/
-	# Hooks
-	install -m755 src/hooks/* $(DESTDIR)/usr/lib/network/hooks/
+	install -d $(DESTDIR)/usr/lib/network/connections
+	install -m644 src/lib/{8021x,globals,ip,rfkill} $(DESTDIR)/usr/lib/network/
+	install -m644 src/lib/connections/* $(DESTDIR)/usr/lib/network/connections/
+	install -m755 src/lib/{auto.action,network} $(DESTDIR)/usr/lib/network/
 	# Scripts
 	install -d $(DESTDIR)/usr/bin
 	install -m755 \
-	    scripts/netcfg \
-	    scripts/netcfg-daemon \
-	    scripts/netcfg-menu \
-	    scripts/netcfg-wpa_actiond \
-	    scripts/netcfg-wpa_actiond-action \
-	    scripts/wifi-menu \
+	    src/netctl \
+	    src/netctl-auto \
+	    src/wifi-menu \
 	    $(DESTDIR)/usr/bin/
-	install -Dm755 scripts/ifplugd.action $(DESTDIR)/etc/ifplugd/netcfg.action
-	install -Dm755 scripts/pm-utils $(DESTDIR)/usr/lib/pm-utils/sleep.d/50netcfg
-	# Daemons
-	install -Dm755 rc.d/net-set-variable $(DESTDIR)/etc/rc.d/functions.d/net-set-variable
-	install -m755 \
-	    rc.d/net-profiles \
-	    rc.d/net-rename \
-	    rc.d/net-auto-wired \
-	    rc.d/net-auto-wireless \
-	    $(DESTDIR)/etc/rc.d/
+	install -Dm755 src/ifplugd.action $(DESTDIR)/etc/ifplugd/netctl.action
+	# Services
 	install -d $(DESTDIR)/usr/lib/systemd/system
-	install -m644 \
-	    systemd/*.service \
-	    $(DESTDIR)/usr/lib/systemd/system/
+	install -m644 services/*.service $(DESTDIR)/usr/lib/systemd/system/
 
 install-docs: docs
-	install -d $(DESTDIR)/usr/share/man/{man5,man8}
+	install -d $(DESTDIR)/usr/share/man/{man1,man5,man7}
+	install -m644 docs/*.1 $(DESTDIR)/usr/share/man/man1/
 	install -m644 docs/*.5 $(DESTDIR)/usr/share/man/man5/
-	install -m644 docs/*.8 $(DESTDIR)/usr/share/man/man8/
-	install -d $(DESTDIR)/usr/share/doc/netcfg/contrib
-	install -m644 contrib/{*.hook,pm-utils.handler} $(DESTDIR)/usr/share/doc/netcfg/contrib/
+	install -m644 docs/*.7 $(DESTDIR)/usr/share/man/man7/
 
 docs:
 	$(MAKE) -C $@
 
-tarball: netcfg-$(VERSION).tar.xz
-netcfg-$(VERSION).tar.xz: | docs
-	cp scripts/netcfg{,.orig}
-	sed -i "s/NETCFG_VER=.*/NETCFG_VER=$(VERSION)/" scripts/netcfg
+tarball: netctl-$(VERSION).tar.xz
+netctl-$(VERSION).tar.xz: | docs
+	cp src/netctl{,.orig}
+	sed -i "s/NETCTL_VERSION=.*/NETCTL_VERSION=$(VERSION)/" src/netctl
 	git stash save -q
-	git archive -o netcfg-$(VERSION).tar --prefix=netcfg-$(VERSION)/ stash
+	git archive -o netctl-$(VERSION).tar --prefix=netctl-$(VERSION)/ stash
 	git stash pop -q
-	mv scripts/netcfg{.orig,}
-	tar --exclude-vcs --transform "s%^%netcfg-$(VERSION)/%" --owner=root --group=root --mtime=./netcfg-$(VERSION).tar -rf netcfg-$(VERSION).tar docs/*.[1-8]
-	xz netcfg-$(VERSION).tar
+	mv src/netctl{.orig,}
+	tar --exclude-vcs --transform "s%^%netctl-$(VERSION)/%" --owner=root --group=root --mtime=./netctl-$(VERSION).tar -rf netctl-$(VERSION).tar docs/*.[1-8]
+	xz netctl-$(VERSION).tar
 
 pkgbuild: PKGBUILD
-PKGBUILD: netcfg-$(VERSION).tar.xz
+PKGBUILD: netctl-$(VERSION).tar.xz
 	sed -e "s/%pkgver%/$(VERSION)/" -e "s/%md5sum%/$(shell md5sum $< | cut -d ' ' -f 1)/" contrib/PKGBUILD > $@
 
-upload: netcfg-$(VERSION).tar.xz
-	md5sum $< > MD5SUMS.$(VERSION)
-	scp $< MD5SUMS.$(VERSION) gerolde.archlinux.org:/srv/ftp/other/netcfg/
-
 clean:
 	$(MAKE) -C docs clean
-	-@rm -vf PKGBUILD *.xz MD5SUMS.* 2>/dev/null
+	-@rm -vf PKGBUILD *.xz 2>/dev/null
 
-- 
cgit v1.2.3-24-g4f1b