X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/c26c2edc7af89ece52a0b472420f146d92efe26d..fee25cd0ec18ba7f5bc820f6b2db3a315e64548f:/package/haserl/Makefile?ds=sidebyside

diff --git a/package/haserl/Makefile b/package/haserl/Makefile
index 40e542dac..05c6b47b1 100644
--- a/package/haserl/Makefile
+++ b/package/haserl/Makefile
@@ -2,25 +2,23 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_NAME := haserl
-PKG_VERSION := 0.8.0
-PKG_RELEASE := 1
-PKG_MD5SUM := bd9195d086566f56634c0bcbbbcbebea
-
-PKG_SOURCE_URL := \
-	@SF/haserl \
-	http://nthill.free.fr/openwrt/sources/$(PKG_NAME)/
-PKG_SOURCE := $(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_CAT := zcat
-
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_NAME:=haserl
+PKG_VERSION:=0.8.0
+PKG_RELEASE:=1
+PKG_MD5SUM:=bd9195d086566f56634c0bcbbbcbebea
+
+PKG_SOURCE_URL:=@SF/haserl
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_CAT:=zcat
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(TOPDIR)/package/rules.mk
 
 $(eval $(call PKG_template,HASERL,haserl,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
 	(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS) -DMAX_UPLOAD_KB=8192" \
@@ -45,19 +43,19 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
 		  $(DISABLE_LARGEFILE) \
 		  $(DISABLE_NLS) \
 	)
-	touch $(PKG_BUILD_DIR)/.configured
+	touch $@
 
-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
-	$(MAKE) -C $(PKG_BUILD_DIR)
+$(PKG_BUILD_DIR)/.built:
+	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_HASERL):
 	install -m0755 -d $(IDIR_HASERL)/usr/bin
-	cp -fpR $(PKG_INSTALL_DIR)/usr/bin/haserl $(IDIR_HASERL)/usr/bin/
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/haserl $(IDIR_HASERL)/usr/bin/
 	$(RSTRIP) $(IDIR_HASERL)
 	$(IPKG_BUILD) $(IDIR_HASERL) $(PACKAGE_DIR)