[pkg-wpa-devel] r1333 - in /hostapd/trunk/debian: install rules

[kelmo-guest at users.alioth.debian.org]

Author: kelmo-guest
Date: Wed Mar 11 17:49:40 2009
New Revision: 1333

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1333
Log:
Tweak build system and reduce debian/rules.

Modified:
    hostapd/trunk/debian/install
    hostapd/trunk/debian/rules

Modified: hostapd/trunk/debian/install
URL: http://svn.debian.org/wsvn/pkg-wpa/hostapd/trunk/debian/install?rev=1333&op=diff
==============================================================================
--- hostapd/trunk/debian/install (original)
+++ hostapd/trunk/debian/install Wed Mar 11 17:49:40 2009
@@ -1,2 +1,4 @@
-hostapd/hostapd     usr/sbin/
-hostapd/hostapd_cli usr/bin/
+hostapd/hostapd      usr/sbin/
+hostapd/hostapd_cli  usr/bin/
+hostapd/hostapd.conf etc/hostapd/
+debian/ifupdown.sh   etc/hostapd/

Modified: hostapd/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-wpa/hostapd/trunk/debian/rules?rev=1333&op=diff
==============================================================================
--- hostapd/trunk/debian/rules (original)
+++ hostapd/trunk/debian/rules Wed Mar 11 17:49:40 2009
@@ -19,25 +19,20 @@
 %:
 	dh $@
 
-override_dh_auto_configure:
+override_dh_auto_build:
 	cp -v $(CONFIG) hostapd/.config
-
-override_dh_auto_build:
 	$(MAKE) -C hostapd all
-
-override_dh_auto_install:
-	install -m 0755 debian/ifupdown.sh \
-		debian/hostapd/etc/hostapd/ifupdown.sh
-	install -m 0600 hostapd/hostapd.conf \
-		debian/hostapd/etc/hostapd/hostapd.conf
-	sed -i 's#/etc/hostapd\.#/etc/hostapd/#' \
-		debian/hostapd/etc/hostapd/hostapd.conf
 
 override_dh_auto_clean:
 	$(MAKE) -C hostapd clean
-	$(RM) hostapd/.config
+	rm -f hostapd/.config
 
 override_dh_fixperms:
+	chmod 0755 debian/hostapd/etc/hostapd/ifupdown.sh
+	chmod 0600 debian/hostapd/etc/hostapd/hostapd.conf
+	# Patch hostapd.conf to refer to /etc/hostapd/*
+	sed -i 's#/etc/hostapd\.#/etc/hostapd/hostapd.#g' \
+		debian/hostapd/etc/hostapd/hostapd.conf
 	dh_fixperms -Xetc/hostapd/hostapd.conf
 
 override_dh_installchangelogs: