summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJouke Witteveen <j.witteveen@gmail.com>2012-03-04 12:19:03 +0100
committerJouke Witteveen <j.witteveen@gmail.com>2012-03-04 12:19:03 +0100
commit5e7df6ce79c6d7217d583d45b858f958f7a2e600 (patch)
tree00a1dcd94d671060593c6b42fae9c2c96252e164
parenta6c908d784d2d9b95a6df4c86f0a49338d7f6342 (diff)
downloadnetctl-5e7df6ce79c6d7217d583d45b858f958f7a2e600.tar.gz
netctl-5e7df6ce79c6d7217d583d45b858f958f7a2e600.tar.xz
Build documentation at buildtime
This justifies the asciidoc make dependency. Previously, pre-built documentation was supplied with the netcfg sources. Now only documentation source and the Makefile is provided.
-rw-r--r--Makefile11
-rwxr-xr-xscripts/netcfg2
2 files changed, 7 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 38c58e4..1a11432 100644
--- a/Makefile
+++ b/Makefile
@@ -60,17 +60,18 @@ install-docs: docs
docs:
$(MAKE) -C $@
-tarball: docs
- sed -i "s/NETCFG_VER=.*/NETCFG_VER=$(VERSION)/" scripts/netcfg
+tarball: netcfg-$(VERSION).tar.gz
+netcfg-$(VERSION).tar.gz:
-rm -rf netcfg-$(VERSION)
mkdir -p netcfg-$(VERSION)
cp -r docs config rc.d src scripts src-wireless systemd contrib Makefile LICENSE README netcfg-$(VERSION)
+ sed -i "s/NETCFG_VER=.*/NETCFG_VER=$(VERSION)/" netcfg-$(VERSION)/scripts/netcfg
tar -zcvf netcfg-$(VERSION).tar.gz netcfg-$(VERSION)
rm -rf netcfg-$(VERSION)
-upload:
- md5sum netcfg-$(VERSION)*.gz > MD5SUMS.$(VERSION)
- scp netcfg-$(VERSION)*.gz MD5SUMS.$(VERSION) archlinux.org:/srv/ftp/other/netcfg/
+upload: netcfg-$(VERSION).tar.gz
+ md5sum netcfg-$(VERSION).tar.gz > MD5SUMS.$(VERSION)
+ scp netcfg-$(VERSION).tar.gz MD5SUMS.$(VERSION) archlinux.org:/srv/ftp/other/netcfg/
clean:
$(MAKE) -C docs clean
diff --git a/scripts/netcfg b/scripts/netcfg
index 1f734c7..e6de3bd 100755
--- a/scripts/netcfg
+++ b/scripts/netcfg
@@ -2,7 +2,7 @@
. /usr/lib/network/network
-NETCFG_VER=2.7
+NETCFG_VER=2-notpackaged
version()
{