From a601184ec08e8dabbcea233a915813f30ae7f84c Mon Sep 17 00:00:00 2001 From: bbruns Date: Sat, 12 Apr 2014 15:27:58 +0000 Subject: [PATCH] --- Makefile | 1 + debian/rules | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 9dee066..95f1ec0 100644 --- a/Makefile +++ b/Makefile @@ -7,6 +7,7 @@ install: $(DESTDIR)$(PREFIX)/etc/srfirewall cp -r bin/* $(DESTDIR)$(PREFIX)/bin/ cp -r lib/* $(DESTDIR)$(PREFIX)/lib/srfirewall/ + if [ ! -e $(DESTDIR)$(PREFIX)/etc/srfirewall/main.conf ]; then cp -r etc/* $(DESTDIR)$(PREFIX)/etc/srfirewall/; fi install-etc: cp -r etc/* $(DESTDIR)$(PREFIX)/etc/srfirewall/ diff --git a/debian/rules b/debian/rules index cb28b8e..3884ff1 100755 --- a/debian/rules +++ b/debian/rules @@ -5,8 +5,8 @@ #export DH_VERBOSE=1 %: - dh $@ + dh $@ --with quilt -override_dh_auto_install: - $(MAKE) DESTDIR=$$(pwd)/debian/srfirewall PREFIX=/usr install - $(MAKE) DESTDIR=$$(pwd)/debian/srfirewall PREFIX=/usr install-etc +#override_dh_auto_install: +# $(MAKE) DESTDIR=$$(pwd)/debian/srfirewall PREFIX=/usr install +# $(MAKE) DESTDIR=$$(pwd)/debian/srfirewall PREFIX=/usr install-etc