summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-10-22 10:54:33 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-10-22 10:54:33 +0000
commita76ea8011a528b27834b3f9df5df85c2b48d9008 (patch)
treef436247a0716ec670500347a8b9b7f7265664035
parent148a9fd7a1cf4d631f160ee3f5d024f558025cc9 (diff)
more fixes for the V= stuff
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2225 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/bind/Makefile6
-rw-r--r--package/libdb/Makefile10
2 files changed, 8 insertions, 8 deletions
diff --git a/package/bind/Makefile b/package/bind/Makefile
index 934c582b8..eeb428ac3 100644
--- a/package/bind/Makefile
+++ b/package/bind/Makefile
@@ -20,7 +20,7 @@ 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)))
-$(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 +55,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,7 +65,7 @@ $(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
diff --git a/package/libdb/Makefile b/package/libdb/Makefile
index 77510aefe..0fc8687b5 100644
--- a/package/libdb/Makefile
+++ b/package/libdb/Makefile
@@ -19,7 +19,7 @@ include $(TOPDIR)/package/rules.mk
$(eval $(call PKG_template,LIBDB,libdb,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
(cd $(PKG_BUILD_DIR)/build_unix ; \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" \
@@ -61,14 +61,14 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
);
touch $@
-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
+$(PKG_BUILD_DIR)/.built:
rm -rf $(PKG_INSTALL_DIR)
mkdir -p $(PKG_INSTALL_DIR)
$(MAKE) -C $(PKG_BUILD_DIR)/build_unix \
DESTDIR="$(PKG_INSTALL_DIR)" install
touch $@
-$(IPKG_LIBDB): $(STAGING_DIR)/usr/lib/libdb.so
+$(IPKG_LIBDB):
install -m0755 -d $(IDIR_LIBDB)/usr/lib
cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libdb*.so $(IDIR_LIBDB)/usr/lib/
$(RSTRIP) $(IDIR_LIBDB)
@@ -87,5 +87,5 @@ uninstall-dev:
rm -rf $(STAGING_DIR)/usr/include/db.h
rm -rf $(STAGING_DIR)/usr/lib/libdb*.{a,so}
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev