Tweak package build
authorNicolas Thill <nico@openwrt.org>
Thu, 19 May 2005 21:23:30 +0000 (21:23 +0000)
committerNicolas Thill <nico@openwrt.org>
Thu, 19 May 2005 21:23:30 +0000 (21:23 +0000)
SVN-Revision: 975

openwrt/package/siproxd/Makefile
openwrt/package/sipsak/Makefile
openwrt/package/tinc/Makefile

index 035881ab0231ea8124b7ca0835e814cebd4007dc..f291bc78bb5fcbd1415b0939adc183a7ba72d0ab 100644 (file)
@@ -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
index 5adfc6af460b575f1b99149cf13fb9b20200cc23..fc6e7fc54c9615dc9865e4e18a6d59d90134c423 100644 (file)
@@ -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
index bc64cc0e3369d63e3d66fd8779ecb2f2b80bf23f..48eb9a6d804424e7d73bf3dc4e5d54a27a6b31c0 100644 (file)
@@ -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