From b44031deb6b226b92cc05714b939106d54c2619d Mon Sep 17 00:00:00 2001
From: Nicolas Thill <nico@openwrt.org>
Date: Thu, 19 May 2005 21:23:30 +0000
Subject: [PATCH] Tweak package build

SVN-Revision: 975
---
 openwrt/package/siproxd/Makefile |  8 ++++----
 openwrt/package/sipsak/Makefile  |  8 ++++----
 openwrt/package/tinc/Makefile    | 11 +++++------
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/openwrt/package/siproxd/Makefile b/openwrt/package/siproxd/Makefile
index 035881ab02..f291bc78bb 100644
--- a/openwrt/package/siproxd/Makefile
+++ b/openwrt/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/openwrt/package/sipsak/Makefile b/openwrt/package/sipsak/Makefile
index 5adfc6af46..fc6e7fc54c 100644
--- a/openwrt/package/sipsak/Makefile
+++ b/openwrt/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/openwrt/package/tinc/Makefile b/openwrt/package/tinc/Makefile
index bc64cc0e33..48eb9a6d80 100644
--- a/openwrt/package/tinc/Makefile
+++ b/openwrt/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
-- 
2.30.2