[pkg-wpa-devel] r871 - in /wpasupplicant/trunk/debian: changelog dot.config.mk rules

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

Author: kelmo-guest
Date: Fri Aug 24 11:38:57 2007
New Revision: 871

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=871
Log:
* Truncate default build .config. Make madwifi config option conditional on
  MADWIFI variable.

Modified:
    wpasupplicant/trunk/debian/changelog
    wpasupplicant/trunk/debian/dot.config.mk
    wpasupplicant/trunk/debian/rules

Modified: wpasupplicant/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/changelog?rev=871&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Fri Aug 24 11:38:57 2007
@@ -7,8 +7,10 @@
   * Simplify debian/dot.config.mk.
   * Confirm that the ifupdown scripts do set ssid when wpa-ssid is used with a
     value in /etc/network/interfaces. (Closes: #367655)
-
- -- Kel Modderman <kel at otaku42.de>  Fri, 24 Aug 2007 20:52:47 +1000
+  * Truncate default build .config. Make madwifi config option conditional on
+    MADWIFI variable.
+
+ -- Kel Modderman <kel at otaku42.de>  Fri, 24 Aug 2007 21:37:59 +1000
 
 wpasupplicant (0.6.0-2) unstable; urgency=low
 

Modified: wpasupplicant/trunk/debian/dot.config.mk
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/dot.config.mk?rev=871&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/dot.config.mk (original)
+++ wpasupplicant/trunk/debian/dot.config.mk Fri Aug 24 11:38:57 2007
@@ -4,11 +4,13 @@
 #
 
 $(DOTCONFIG):
-	echo CONFIG_DRIVER_ATMEL=y		>> $@
+	echo CONFIG_DRIVER_ATMEL=y		>  $@
 	echo CONFIG_DRIVER_HOSTAP=y		>> $@
 	echo CONFIG_DRIVER_IPW=y		>> $@
+ifdef MADWIFI
 	echo CONFIG_DRIVER_MADWIFI=y		>> $@
 	echo CFLAGS+=-I../driver_madwifi	>> $@
+endif
 	echo CONFIG_DRIVER_NDISWRAPPER=y	>> $@
 	echo CONFIG_DRIVER_WEXT=y		>> $@
 	echo CONFIG_DRIVER_WIRED=y		>> $@

Modified: wpasupplicant/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/rules?rev=871&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/rules (original)
+++ wpasupplicant/trunk/debian/rules Fri Aug 24 11:38:57 2007
@@ -12,7 +12,7 @@
 	$(MAKE) -C $(WPADIR)$(WPAGUI)
 
 build/wpasupplicant::
-	$(MAKE) -f debian/dot.config.mk DOTCONFIG=$(WPADIR).config
+	$(MAKE) -f debian/dot.config.mk DOTCONFIG=$(WPADIR).config MADWIFI=1
 	$(MAKE) -C $(WPADIR)
 	# comment upstream example configuration file
 	sed 's/^\([^#]\+=.*\|}\)/#\1/' < $(WPADIR)wpa_supplicant.conf \