add gnupg from Michael Cohen, thx

[openwrt.git] / package / xsupplicant / Makefile

diff --git a/package/xsupplicant/Makefile b/package/xsupplicant/Makefile
index dea7899..2dcf371 100644 (file)
--- a/package/xsupplicant/Makefile
+++ b/package/xsupplicant/Makefile
@@ -3,9 +3,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xsupplicant
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xsupplicant

-PKG_VERSION:=1.2.2
+PKG_VERSION:=1.2.3

 PKG_RELEASE:=1
 PKG_RELEASE:=1

-PKG_MD5SUM:=0e9aaf83a11f8eaff7c6564a53c25d8e
+PKG_MD5SUM:=c9b17b2e1879bac85c583980338fed85

 
 PKG_SOURCE_URL:=@SF/open1x
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 
 PKG_SOURCE_URL:=@SF/open1x
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz


@@ -26,7 +26,9 @@ $(PKG_BUILD_DIR)/.configured:
                touch configure; \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \
                touch configure; \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \

-               CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+               CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include \
+                       -I$(PKG_BUILD_DIR)/lib/libxsupconfig/ \
+                       -I$(STAGING_DIR)/usr/include/madwifi" \

                LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
                ./configure \
                        --target=$(GNU_TARGET_NAME) \
                LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
                ./configure \
                        --target=$(GNU_TARGET_NAME) \


@@ -65,8 +67,8 @@ $(IPKG_XSUPPLICANT):
        install -d -m0755 $(IDIR_XSUPPLICANT)/etc
        install -m0644 $(PKG_BUILD_DIR)/etc/xsupplicant.conf $(IDIR_XSUPPLICANT)/etc/
        install -d -m0755 $(IDIR_XSUPPLICANT)/usr/bin
        install -d -m0755 $(IDIR_XSUPPLICANT)/etc
        install -m0644 $(PKG_BUILD_DIR)/etc/xsupplicant.conf $(IDIR_XSUPPLICANT)/etc/
        install -d -m0755 $(IDIR_XSUPPLICANT)/usr/bin

-       cp -fpR $(PKG_INSTALL_DIR)/usr/bin/xsup_* $(IDIR_XSUPPLICANT)/usr/bin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/bin/xsup_* $(IDIR_XSUPPLICANT)/usr/bin/

        install -d -m0755 $(IDIR_XSUPPLICANT)/usr/sbin
        install -d -m0755 $(IDIR_XSUPPLICANT)/usr/sbin

-       cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/xsupplicant $(IDIR_XSUPPLICANT)/usr/sbin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/xsupplicant $(IDIR_XSUPPLICANT)/usr/sbin/

        $(RSTRIP) $(IDIR_XSUPPLICANT)
        $(IPKG_BUILD) $(IDIR_XSUPPLICANT) $(PACKAGE_DIR)
        $(RSTRIP) $(IDIR_XSUPPLICANT)
        $(IPKG_BUILD) $(IDIR_XSUPPLICANT) $(PACKAGE_DIR)