Tweak package build

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@978 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/usbutils/Makefile b/package/usbutils/Makefile
index 84502e6..02f9d44 100644 (file)
--- a/package/usbutils/Makefile
+++ b/package/usbutils/Makefile
@@ -48,15 +48,15 @@ $(PKG_BUILD_DIR)/.configured:
                  --enable-shared \
                  --disable-static \
        );
-       touch $(PKG_BUILD_DIR)/.configured
+       touch $@
 
 $(PKG_BUILD_DIR)/.built:
-       $(MAKE) -C $(PKG_BUILD_DIR)
+       rm -rf $(PKG_INSTALL_DIR)
        mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \
                DESTDIR="$(PKG_INSTALL_DIR)" \
-               install
-       touch $(PKG_BUILD_DIR)/.built
+               all install
+       touch $@
 
 $(IPKG_LSUSB):
        install -d -m0755 $(IDIR_LSUSB)/usr/share

diff --git a/package/vsftpd/Makefile b/package/vsftpd/Makefile
index a8b32f1..1801d80 100644 (file)
--- a/package/vsftpd/Makefile
+++ b/package/vsftpd/Makefile
@@ -19,17 +19,17 @@ include $(TOPDIR)/package/rules.mk
 $(eval $(call PKG_template,VSFTPD,vsftpd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
 $(PKG_BUILD_DIR)/.configured:
-       touch $(PKG_BUILD_DIR)/.configured
+       touch $@
 
 $(PKG_BUILD_DIR)/.built:
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               $(TARGET_CONFIGURE_OPTS) \
-               CFLAGS="$(TARGET_CFLAGS)"
+       rm -rf $(PKG_INSTALL_DIR)
        mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \
+               $(TARGET_CONFIGURE_OPTS) \
+               CFLAGS="$(TARGET_CFLAGS)" \
                DESTDIR="$(PKG_INSTALL_DIR)" \
-               install
-       touch $(PKG_BUILD_DIR)/.built
+               vsftpd install
+       touch $@
 
 $(IPKG_VSFTPD):
        install -d -m0755 $(IDIR_VSFTPD)/etc

diff --git a/package/wol/Makefile b/package/wol/Makefile
index b3339bb..3a88116 100644 (file)
--- a/package/wol/Makefile
+++ b/package/wol/Makefile
@@ -18,7 +18,7 @@ include $(TOPDIR)/package/rules.mk
 
 $(eval $(call PKG_template,WOL,wol,$(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="$(TARGET_CFLAGS)" \
@@ -48,16 +48,16 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
                  $(DISABLE_NLS) \
                  $(DISABLE_LARGEFILE) \
        );
-       touch $(PKG_BUILD_DIR)/.configured
+       touch $@
 
-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               CC=$(TARGET_CC)
+$(PKG_BUILD_DIR)/.built:
+       rm -rf $(PKG_INSTALL_DIR)
        mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \
+               CC=$(TARGET_CC) \
                DESTDIR="$(PKG_INSTALL_DIR)" \
-               install
-       touch $(PKG_BUILD_DIR)/.built
+               all install
+       touch $@
 
 $(IPKG_WOL):
        install -m0755 -d $(IDIR_WOL)/usr/bin

diff --git a/package/xinetd/Makefile b/package/xinetd/Makefile
index 71b9cf2..7dcb20e 100644 (file)
--- a/package/xinetd/Makefile
+++ b/package/xinetd/Makefile
@@ -49,15 +49,15 @@ $(PKG_BUILD_DIR)/.configured:
                  --without-libwrap \
                  --with-loadavg \
        );
-       touch $(PKG_BUILD_DIR)/.configured
+       touch $@
 
 $(PKG_BUILD_DIR)/.built:
-       $(MAKE) -C $(PKG_BUILD_DIR)
+       rm -rf $(PKG_INSTALL_DIR)
        mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \
                DESTDIR="$(PKG_INSTALL_DIR)" \
-               install
-       touch $(PKG_BUILD_DIR)/.built
+               build install
+       touch $@
 
 $(IPKG_XINETD):
        install -d -m0755 $(IDIR_XINETD)/etc