fix small typo

[openwrt.git] / package / bind / Makefile

diff --git a/package/bind/Makefile b/package/bind/Makefile
index d65d191..f635ef4 100644 (file)
--- a/package/bind/Makefile
+++ b/package/bind/Makefile
@@ -19,8 +19,15 @@ include $(TOPDIR)/package/rules.mk
 
 $(eval $(call PKG_template,BIND_SERVER,bind-server,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 $(eval $(call PKG_template,BIND_CLIENT,bind-client,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,BIND_TOOLS,bind-tools,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,BIND_RNDC,bind-rndc,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,BIND_CHECK,bind-check,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,BIND_DNSSEC,bind-dnssec,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,BIND_HOST,bind-host,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,BIND_DIG,bind-dig,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+
+$(PKG_BUILD_DIR)/.configured:
        (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(strip $(TARGET_CFLAGS))" \
@@ -55,7 +62,7 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
        );
        touch $(PKG_BUILD_DIR)/.configured
 
-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
+$(PKG_BUILD_DIR)/.built:
        $(MAKE) -C $(PKG_BUILD_DIR)/lib/dns \
                CC="$(HOSTCC)" \
                CFLAGS="-O2" \
@@ -65,19 +72,67 @@ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
        $(MAKE) -C $(PKG_BUILD_DIR) \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                all install
-       touch $(PKG_BUILD_DIR)/.built
+       touch $@
 
 $(IPKG_BIND_SERVER):
        install -d -m0755 $(IDIR_BIND_SERVER)/usr/sbin
        install -d -m0755 $(IDIR_BIND_SERVER)/etc/init.d
-       cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/named $(IDIR_BIND_SERVER)/usr/sbin/
-       cp -fpR files/bind $(IDIR_BIND_SERVER)/etc
-       cp -fpR files/named.init $(IDIR_BIND_SERVER)/etc/init.d/S$(PKG_INIT_LEVEL)named
+       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/named $(IDIR_BIND_SERVER)/usr/sbin/
+       $(CP) files/bind $(IDIR_BIND_SERVER)/etc
+       $(CP) files/named.init $(IDIR_BIND_SERVER)/etc/init.d/S$(PKG_INIT_LEVEL)named
+       find $(IDIR_BIND_SERVER)/etc/bind -name ".svn" | xargs rm -rf
        $(RSTRIP) $(IDIR_BIND_SERVER)
        $(IPKG_BUILD) $(IDIR_BIND_SERVER) $(PACKAGE_DIR)
 
 $(IPKG_BIND_CLIENT):
        install -d -m0755 $(IDIR_BIND_CLIENT)/usr/bin
-       cp -fpR $(PKG_INSTALL_DIR)/usr/bin/nsupdate $(IDIR_BIND_CLIENT)/usr/bin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/bin/nsupdate $(IDIR_BIND_CLIENT)/usr/bin/
        $(RSTRIP) $(IDIR_BIND_CLIENT)
        $(IPKG_BUILD) $(IDIR_BIND_CLIENT) $(PACKAGE_DIR)
+
+$(IPKG_BIND_TOOLS):
+       install -d -m0755 $(IDIR_BIND_TOOLS)/usr/bin
+       install -d -m0755 $(IDIR_BIND_TOOLS)/usr/sbin
+       $(CP) $(PKG_INSTALL_DIR)/usr/bin/dig $(IDIR_BIND_TOOLS)/usr/bin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/bin/host $(IDIR_BIND_TOOLS)/usr/bin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/dnssec-keygen $(IDIR_BIND_TOOLS)/usr/sbin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/dnssec-signzone $(IDIR_BIND_TOOLS)/usr/sbin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/named-checkconf $(IDIR_BIND_TOOLS)/usr/sbin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/named-checkzone $(IDIR_BIND_TOOLS)/usr/sbin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/rndc $(IDIR_BIND_TOOLS)/usr/sbin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/rndc-confgen $(IDIR_BIND_TOOLS)/usr/sbin/
+       $(RSTRIP) $(IDIR_BIND_TOOLS)
+       $(IPKG_BUILD) $(IDIR_BIND_TOOLS) $(PACKAGE_DIR)
+
+$(IPKG_BIND_RNDC):
+       install -d -m0755 $(IDIR_BIND_RNDC)/usr/sbin
+       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/rndc $(IDIR_BIND_RNDC)/usr/sbin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/rndc-confgen $(IDIR_BIND_RNDC)/usr/sbin/
+       $(RSTRIP) $(IDIR_BIND_RNDC)
+       $(IPKG_BUILD) $(IDIR_BIND_RNDC) $(PACKAGE_DIR)
+
+$(IPKG_BIND_CHECK):
+       install -d -m0755 $(IDIR_BIND_CHECK)/usr/sbin
+       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/named-checkconf $(IDIR_BIND_CHECK)/usr/sbin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/named-checkzone $(IDIR_BIND_CHECK)/usr/sbin/
+       $(RSTRIP) $(IDIR_BIND_CHECK)
+       $(IPKG_BUILD) $(IDIR_BIND_CHECK) $(PACKAGE_DIR)
+
+$(IPKG_BIND_DNSSEC):
+       install -d -m0755 $(IDIR_BIND_DNSSEC)/usr/sbin
+       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/dnssec-keygen $(IDIR_BIND_DNSSEC)/usr/sbin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/dnssec-signzone $(IDIR_BIND_DNSSEC)/usr/sbin/
+       $(RSTRIP) $(IDIR_BIND_DNSSEC)
+       $(IPKG_BUILD) $(IDIR_BIND_DNSSEC) $(PACKAGE_DIR)
+
+$(IPKG_BIND_HOST):
+       install -d -m0755 $(IDIR_BIND_HOST)/usr/bin
+       $(CP) $(PKG_INSTALL_DIR)/usr/bin/host $(IDIR_BIND_HOST)/usr/bin/
+       $(RSTRIP) $(IDIR_BIND_HOST)
+       $(IPKG_BUILD) $(IDIR_BIND_HOST) $(PACKAGE_DIR)
+
+$(IPKG_BIND_DIG):
+       install -d -m0755 $(IDIR_BIND_DIG)/usr/bin
+       $(CP) $(PKG_INSTALL_DIR)/usr/bin/dig $(IDIR_BIND_DIG)/usr/bin/
+       $(RSTRIP) $(IDIR_BIND_DIG)
+       $(IPKG_BUILD) $(IDIR_BIND_DIG) $(PACKAGE_DIR)