From 48e69e6e71ed8e65a119ced3bf7b9f496dcc8385 Mon Sep 17 00:00:00 2001
From: Nicolas Thill <nico@openwrt.org>
Date: Thu, 19 May 2005 21:14:18 +0000
Subject: Tweak package build

SVN-Revision: 968
---
 openwrt/package/cyrus-sasl/Makefile | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'openwrt/package/cyrus-sasl')

diff --git a/openwrt/package/cyrus-sasl/Makefile b/openwrt/package/cyrus-sasl/Makefile
index b759ec1..2729883 100644
--- a/openwrt/package/cyrus-sasl/Makefile
+++ b/openwrt/package/cyrus-sasl/Makefile
@@ -7,9 +7,7 @@ PKG_VERSION:=2.1.20
 PKG_RELEASE:=1
 PKG_MD5SUM:=268ead27f4ac39bcfe17d9e38e0f2977
 
-PKG_SOURCE_URL:= \
-	http://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
-	http://nthill.free.fr/openwrt/sources/$(PKG_NAME)/
+PKG_SOURCE_URL:=http://ftp.andrew.cmu.edu/pub/cyrus-mail/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_CAT:=zcat
 
@@ -85,20 +83,20 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
 		  --without-dmalloc \
 		  --without-sfio \
 	);
-	touch $(PKG_BUILD_DIR)/.configured
+	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)/include \
 		CC="$(HOSTCC)" \
 		LINK="$(HOSTCC) -o makemd5 -lc" \
 		CFLAGS="" \
 		makemd5
-	$(MAKE) -C $(PKG_BUILD_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_LIBSASL2):
 	install -m0755 -d $(IDIR_LIBSASL2)/usr/lib/
-- 
cgit v1.1