X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=ipv6%2Fdhcp6%2FMakefile;h=056814a6dc5c7c94efaab24636f87a16257528c6;hp=839afb1e4bf0e65491d76dca83e6276c7ebe0085;hb=a63e6cbc65621972850c73c3bb5de1bc7a1b6ce9;hpb=e08c673bfab61250bf42c8d9fccd17c175060f4a

diff --git a/ipv6/dhcp6/Makefile b/ipv6/dhcp6/Makefile
old mode 100755
new mode 100644
index 839afb1e4b..056814a6dc
--- a/ipv6/dhcp6/Makefile
+++ b/ipv6/dhcp6/Makefile
@@ -1,41 +1,44 @@
 #
-# 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
 
 PKG_NAME:=dhcp6
 PKG_VERSION:=1.0
 PKG_RELEASE:=1
-PKG_MD5SUM:=86193dfa62137db3ea459543db4f1102
-PKG_SOURCE_URL:=@SF/dhcpv6-linux
-PKG_SOURCE:=dhcpv6-linux-$(PKG_VERSION).zip
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_CAT:=unzip
 
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_SOURCE:=dhcpv6-linux-$(PKG_VERSION).zip
+PKG_SOURCE_URL:=@SF/dhcpv6-linux
+PKG_MD5SUM:=86193dfa62137db3ea459543db4f1102
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/dhcp6
+PKG_UNPACK:=unzip -d $(PKG_BUILD_DIR)/ $(DL_DIR)/$(PKG_SOURCE)
+
+define Package/dhcp6/Default
   SECTION:=ipv6
   CATEGORY:=IPv6
   DEPENDS:=+libncurses
-  SUBMENU:=IPv6 DHCP server and client
-  TITLE:=IPv6 DHCP server and client
-  DESCRIPTION:=IPv6 DHCP server and client
+  TITLE:=IPv6 DHCP
   URL:=http://sourceforge.net/projects/dhcpv6-linux
 endef
 
+define Package/dhcp6-client
+  $(call Package/dhcp6/Default)
+  TITLE+= client
+endef
+
+define Package/dhcp6-client/conffiles
+/etc/dhcp6/solicit.conf
+endef
+
 define Package/dhcp6-server
-  $(call Package/dhcp6)
-  DEFAULT:=m if ALL
-  TITLE:=DHCPv6 server
-  DESCRIPTION:=DHCPv6 server
+  $(call Package/dhcp6/Default)
+  TITLE+= server
 endef
 
 define Package/dhcp6-server/conffiles
@@ -44,36 +47,34 @@ define Package/dhcp6-server/conffiles
 /etc/dhcpd6/partial_leases6.conf
 endef
 
-define Package/dhcp6-client
-  $(call Package/dhcp6)
-  DEFAULT:=m if ALL
-  TITLE:=DHCPv6 client
-  DESCRIPTION:=DHCPv6 client
+define Build/Prepare
+	$(call Build/Prepare/Default)
+	# prevent package from rebuilding
+	find $(PKG_BUILD_DIR) | xargs touch
 endef
 
-define Package/dhcp6-client/conffiles
-/etc/dhcp6/solicit.conf
-endef
-
-
 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR)/server \
-		CC="$(TARGET_CC)" STAGING_DIR=$(STAGING_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR)/client \
-		CC="$(TARGET_CC)" STAGING_DIR=$(STAGING_DIR)
+		CC="$(TARGET_CC)" \
+		CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
+		LDFLAGS="$(TARGET_LDFLAGS)"
+	$(MAKE) -C $(PKG_BUILD_DIR)/server \
+		CC="$(TARGET_CC)" \
+		CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
+		LDFLAGS="$(TARGET_LDFLAGS)"
 endef
 
-define Package/dhcp6-server/install
-	install -d -m0755 $(1)/usr/sbin $(1)/etc/dhcpd6
-	install -m0755 $(PKG_BUILD_DIR)/server/serv $(1)/usr/sbin/dhcpd6
-	install -m0755 $(PKG_BUILD_DIR)/server/*.conf $(1)/etc/dhcpd6/
+define Package/dhcp6-client/install
+	$(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/dhcp6
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/client/cli $(1)/usr/sbin/dhcp6client
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/client/solicit.conf $(1)/etc/dhcp6/
 endef
 
-define Package/dhcp6-client/install
-	install -d $(1)/usr/sbin $(1)/etc/dhcp6
-	install -m0755 $(PKG_BUILD_DIR)/client/cli $(1)/usr/sbin/dhcp6client
-	install -m0755 $(PKG_BUILD_DIR)/client/solicit.conf $(1)/etc/dhcp6/
+define Package/dhcp6-server/install
+	$(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/dhcpd6
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/server/serv $(1)/usr/sbin/dhcpd6
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/server/*.conf $(1)/etc/dhcpd6/
 endef
 
-$(eval $(call BuildPackage,dhcp6-server))
 $(eval $(call BuildPackage,dhcp6-client))
+$(eval $(call BuildPackage,dhcp6-server))