Change haserl, uniformize package makefile

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

1 files changed, 28 insertions, 23 deletions

diff --git a/package/haserl/Makefile b/package/haserl/Makefile
index e361d4504..1a1677adc 100644
--- a/package/haserl/Makefile
+++ b/package/haserl/Makefile
@@ -7,23 +7,29 @@ PKG_VERSION := 0.8.0
 PKG_RELEASE := 1
 PKG_MD5SUM := bd9195d086566f56634c0bcbbbcbebea
 
-PKG_SOURCE_URL := @SF/haserl
+PKG_SOURCE_URL := \
+	@SF/haserl \
+	http://nthill.free.fr/openwrt/sources/$(PKG_NAME)/
 PKG_SOURCE := $(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_CAT := zcat
-PKG_IPK := $(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
-PKG_IPK_DIR := $(PKG_BUILD_DIR)/ipkg
+
+PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
+IPKG_HASERL:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
+IDIR_HASERL:=$(PKG_BUILD_DIR)/ipkg/$(PKG_NAME)
+INFO_HASERL:=$(IPKG_STATE_DIR)/info/$(PKG_NAME).list
+
 $(DL_DIR)/$(PKG_SOURCE):
 	 $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL)
 
-$(PKG_BUILD_DIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE)
+$(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE)
+	rm -rf $(PKG_BUILD_DIR)
 	$(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	touch $(PKG_BUILD_DIR)/.unpacked
+	touch $(PKG_BUILD_DIR)/.prepared
 
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.unpacked
-	(cd $(PKG_BUILD_DIR); rm -rf config.cache; \
+$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+	(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS) -DMAX_UPLOAD_KB=8192" \
 		./configure \
@@ -56,25 +62,24 @@ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
 $(PKG_INSTALL_DIR)/usr/bin/haserl: $(PKG_BUILD_DIR)/.built
 	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
-	  DESTDIR="$(PKG_INSTALL_DIR)" \
-	 install
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+		install
 	
-$(PKG_IPK): $(PKG_INSTALL_DIR)/usr/bin/haserl
-	$(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) ./ipkg/$(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
-	mkdir -p $(PKG_IPK_DIR)/usr/bin
-	cp -fpR $(PKG_INSTALL_DIR)/usr/bin/haserl $(PKG_IPK_DIR)/usr/bin/
-	$(STRIP) $(PKG_IPK_DIR)/usr/bin/*
-	$(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR)
+$(IPKG_HASERL): $(PKG_INSTALL_DIR)/usr/bin/haserl
+	$(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_HASERL) ./ipkg/$(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
+	install -m0755 -d $(IDIR_HASERL)/usr/bin
+	cp -fpR $(PKG_INSTALL_DIR)/usr/bin/haserl $(IDIR_HASERL)/usr/bin/
+	$(RSTRIP) $(IDIR_HASERL)
+	$(IPKG_BUILD) $(IDIR_HASERL) $(PACKAGE_DIR)
 
-$(IPKG_STATE_DIR)/info/$(PKG_NAME).list: $(PKG_IPK)
-	$(IPKG) install $(PKG_IPK)
+$(INFO_HASERL): $(IPKG_HASERL)
+	$(IPKG) install $(IPKG_HASERL)
 
 source: $(DL_DIR)/$(PKG_SOURCE)
-prepare: $(PKG_BUILD_DIR)/.unpacked
-compile: $(PKG_IPK)
-install: $(IPKG_STATE_DIR)/info/$(PKG_NAME).list
+prepare: $(PKG_BUILD_DIR)/.prepared
+compile: $(IPKG_HASERL)
+install: $(INFO_HASERL)
 
 clean:
 	rm -rf $(PKG_BUILD_DIR)
-	rm -f $(PKG_IPK)
-
+	rm -rf $(IPKG_HASERL)