From: Michael Prokop <mika@debian.org>
Date: Mon, 14 Dec 2009 02:44:48 +0000 (+0100)
Subject: Simplify debian/rules and sync with uanytun
X-Git-Tag: v0.3.2-1~6
X-Git-Url: https://git.syn-net.org/debian/?p=anytun.git;a=commitdiff_plain;h=48365fcf0076d7c979eb40e9580eb27dfdc5120b

Simplify debian/rules and sync with uanytun
---

diff --git a/debian/rules b/debian/rules
index cfc7167..fdee961 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,34 +9,30 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -Os
-endif
-
-config.status:
+configure: configure-stamp
+configure-stamp:
 	dh_testdir
-	# Add here commands to configure the package.
-	cd src/ && ./configure
+	cd src && ./configure --prefix=/usr --sysconfdir=/etc --examplesdir=/usr/share/anytun/examples && cd ..
+	touch configure-stamp
 
 build: build-stamp
 
-build-stamp:  config.status
+build-stamp: configure-stamp
 	dh_testdir
 
-	# Add here commands to compile the package.
-	$(MAKE) --directory=$(CURDIR)/src
-	cd src/man && $(MAKE)
+	cd src && $(MAKE) && cd ..
 
 	touch $@
 
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp
+	rm -f build-stamp configure-stamp
+
+	cd src && $(MAKE) distclean && cd ..
+
+	# drop leftover file:
+	rm -f src/tun.c
 
 	# Add here commands to clean up after the build process.
 	$(MAKE) --directory=$(CURDIR)/src distclean
@@ -45,38 +41,32 @@ clean:
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
-	dh_installdirs usr/bin usr/sbin usr/share/man/man8 etc/anytun etc/init.d/ usr/share/anytun
+	dh_installdirs
 
 	# Add here commands to install the package into debian/anytun.
-	install $(CURDIR)/src/anytun            $(CURDIR)/debian/anytun/usr/sbin/
-	install $(CURDIR)/src/anytun-config     $(CURDIR)/debian/anytun/usr/bin/
-	install $(CURDIR)/src/anytun-controld   $(CURDIR)/debian/anytun/usr/bin/
-	install $(CURDIR)/src/anytun-showtables $(CURDIR)/debian/anytun/usr/bin/
-	# currently broken (known upstream):
-	# install $(CURDIR)/src/anyrtpproxy/anyrtpproxy $(CURDIR)/debian/anytun/usr/bin/
-	cp $(CURDIR)/src/man/*.8                $(CURDIR)/debian/anytun/usr/share/man/man8
-	install $(CURDIR)/etc/init.d/anytun     $(CURDIR)/debian/anytun/etc/init.d/
-	cp -a $(CURDIR)/etc/anytun              $(CURDIR)/debian/anytun/etc/
-	cp -a $(CURDIR)/wireshark-lua           $(CURDIR)/debian/anytun/usr/share/anytun/
+	cd src && $(MAKE) DESTDIR=$(CURDIR)/debian/anytun install && cd ..
+	# Fix unusual path:
+	mv debian/anytun/usr/share/anytun/examples/anytun debian/anytun/usr/share/anytun/examples/config
 
 # Build architecture-independent files here.
-binary-indep: build install
+binary-indep: install
 # We have nothing to do by default.
 
 # Build architecture-dependent files here.
-binary-arch: build install
+binary-arch: install
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs
+	dh_installchangelogs ChangeLog
 	dh_installdocs
 	dh_installexamples
 	dh_installinit
-	dh_installman
+	# dh_installman src/man/anytun.8
 	dh_link
 	dh_strip
 	dh_compress
 	dh_fixperms
+	find debian/anytun -type f -name config     -exec chmod 600 {} \;
+	find debian/anytun -type f -name post-up.sh -exec chmod 755 {} \;
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol
@@ -84,4 +74,4 @@ binary-arch: build install
 	dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+.PHONY: build clean binary-indep binary-arch binary install configure