Fix patch to make it usable with brcm-2.4 and brcm-2.6

[openwrt/svn-archive/archive.git] / net / click / Makefile

diff --git a/net/click/Makefile b/net/click/Makefile
index 31c98c594df0a8016a8358c75c8f2d3f4a2e038a..9606e08cefd329a41c3b32bb2e0090612af68626 100644 (file)
--- a/net/click/Makefile
+++ b/net/click/Makefile
@@ -41,17 +41,24 @@ define Package/roofnet
   URL:=http://pdos.csail.mit.edu/roofnet/
 endef
 
+BUILDOPTS = \
+               BUILD_CXX="g++ -I $(PKG_BUILD_DIR)/include-host" \
+               BUILD_DL_LIBS="-ldl"
 
 define Build/Configure
        (cd $(PKG_BUILD_DIR); \
+               rm -rf config.{cache,status} ; \
+               CONFIG_SITE= \
                ./configure; \
-               cp include/click/config.h include/click/config-host.h; \
+               rm -rf include-host; \
+               $(CP) include include-host; \
                rm -rf config.{cache,status} ; \
                $(TARGET_CONFIGURE_OPTS) \
                CXXFLAGS="-static -O2 -MD" \
                CFLAGS="-static -MD" \
                CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
                LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
+               $(BUILDOPTS) \
                ./configure \
                  --prefix=/usr \
                  --target=$(GNU_TARGET_NAME) \
@@ -68,8 +75,9 @@ endef
 define Build/Compile
        rm -rf $(PKG_INSTALL_DIR)
        mkdir -p $(PKG_INSTALL_DIR)
+       $(CONF_OPTS) \
        $(MAKE) -C $(PKG_BUILD_DIR) \
-               BUILD_CXX="g++ -include $(PKG_BUILD_DIR)/include/click/config-host.h" \
+               $(BUILDOPTS) \
                tools elementmap.xml
        (cd $(PKG_BUILD_DIR)/userlevel; \
                ../tools/click-mkmindriver/click-mkmindriver -p roofnet -C .. \
@@ -92,7 +100,7 @@ define Package/roofnet/install
        $(CP) $(PKG_BUILD_DIR)/conf/wifi/read_handler $(1)/usr/bin
        $(CP) $(PKG_BUILD_DIR)/conf/wifi/write_handler $(1)/usr/bin
        mkdir -p $(1)/etc/init.d
-       install -m 755 ./files/S50roofnet $(1)/etc/init.d/
+       install -m 755 ./files/roofnet.init $(1)/etc/init.d/roofnet
 endef
 
 $(eval $(call BuildPackage,click))