Tweak package build

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

diff --git a/package/siproxd/Makefile b/package/siproxd/Makefile
index 035881a..f291bc7 100644 (file)
--- a/package/siproxd/Makefile
+++ b/package/siproxd/Makefile
@@ -46,15 +46,15 @@ $(PKG_BUILD_DIR)/.configured:
                  $(DISABLE_NLS) \
                  --enable-shared \
        );
-       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_SIPROXD):
        install -d -m0755 $(IDIR_SIPROXD)/etc

diff --git a/package/sipsak/Makefile b/package/sipsak/Makefile
index 5adfc6a..fc6e7fc 100644 (file)
--- a/package/sipsak/Makefile
+++ b/package/sipsak/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_SIPSAK):
        install -d -m0755 $(IDIR_SIPSAK)/usr/bin

diff --git a/package/tinc/Makefile b/package/tinc/Makefile
index bc64cc0..48eb9a6 100644 (file)
--- a/package/tinc/Makefile
+++ b/package/tinc/Makefile
@@ -47,18 +47,17 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
                  --with-kernel=$(LINUX_DIR) \
                  --with-zlib=$(STAGING_DIR)/usr/ \
        );
-       touch $(PKG_BUILD_DIR)/.configured
+       touch $@
 
 $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
+       rm -rf $(PKG_INSTALL_DIR)
+       mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \
                CC=$(TARGET_CC) \
                CFLAGS="$(TARGET_CFLAGS)" \
-               all
-       mkdir -p $(PKG_INSTALL_DIR)
-       $(MAKE) -C $(PKG_BUILD_DIR) \
                DESTDIR="$(PKG_INSTALL_DIR)" \
-               install
-       touch $(PKG_BUILD_DIR)/.built
+               all install
+       touch $@
 
 $(IPKG_TINC):
        install -m0755 -d $(IDIR_TINC)/usr/sbin