X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=net%2Fclick%2FMakefile;h=e380e84f1e2bcc2cc2aa08c53950f4c1374596f0;hb=241c69bb401310b1273c88cc35ac2fd2972a7f35;hp=9606e08cefd329a41c3b32bb2e0090612af68626;hpb=5ded2b9a4ce0de6cb0661485c59b95f550cee9d8;p=packages.git

diff --git a/net/click/Makefile b/net/click/Makefile
index 9606e08ce..e380e84f1 100644
--- a/net/click/Makefile
+++ b/net/click/Makefile
@@ -1,9 +1,9 @@
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
@@ -16,31 +16,34 @@ ROOFNET_VERSION:=0.0.1
 
 PKG_SOURCE_URL:=http://pdos.csail.mit.edu/~jbicket/click_snapshots/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_CAT:=zcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/click
   SECTION:=net
   CATEGORY:=Network
+  DEPENDS:=@BROKEN
   MENU:=1
   TITLE:=The Click Modular Router
-  DESCRIPTION:=The Click Modular Router
-  URL:=http://pdos.csail.mit.edu/click/
+  URL:=http://www.read.cs.ucla.edu/click/
+endef
+
+define Package/click/description
+The Click Modular Router
 endef
 
 define Package/roofnet
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=click
+  DEPENDS:=@BROKEN click
   TITLE:=roofnet mesh networking scripts
-  DESCRIPTION:=roofnet mesh networking scripts
   URL:=http://pdos.csail.mit.edu/roofnet/
 endef
 
+define Package/roofnet/description
+roofnet mesh networking scripts
+endef
+
 BUILDOPTS = \
 		BUILD_CXX="g++ -I $(PKG_BUILD_DIR)/include-host" \
 		BUILD_DL_LIBS="-ldl"
@@ -54,10 +57,10 @@ define Build/Configure
 		$(CP) include include-host; \
 		rm -rf config.{cache,status} ; \
 		$(TARGET_CONFIGURE_OPTS) \
-		CXXFLAGS="-static -O2 -MD" \
+		CXXFLAGS="-static -Os -MD" \
 		CFLAGS="-static -MD" \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
+		CPPFLAGS="$(TARGET_CPPFLAGS)" \
+		LDFLAGS="$(TARGET_LDFLAGS)" \
 		$(BUILDOPTS) \
 		./configure \
 		  --prefix=/usr \
@@ -88,19 +91,19 @@ define Build/Compile
 endef
 
 define Package/click/install
-	install -d -m0755 $(1)/usr/bin
+	$(INSTALL_DIR) $(1)/usr/bin
 	$(CP) $(PKG_BUILD_DIR)/userlevel/roofnetclick $(1)/usr/bin/click 
 	$(CP) $(PKG_BUILD_DIR)/tools/click-align/click-align $(1)/usr/bin/click-align
 endef
 
 define Package/roofnet/install
-	install -d -m0755 $(1)/usr/bin
+	$(INSTALL_DIR) $(1)/usr/bin
 	$(CP) $(PKG_BUILD_DIR)/conf/wifi/gen_config_roofnet.sh $(1)/usr/bin
 	$(CP) $(PKG_BUILD_DIR)/conf/wifi/srcr.click $(1)/usr/bin
 	$(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/roofnet.init $(1)/etc/init.d/roofnet
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/roofnet.init $(1)/etc/init.d/roofnet
 endef
 
 $(eval $(call BuildPackage,click))