aboutsummaryrefslogtreecommitdiff
path: root/package/haserl
diff options
context:
space:
mode:
authorGravatar Peter Korsgaard <jacmet@sunsite.dk>2007-05-31 15:19:37 +0000
committerGravatar Peter Korsgaard <jacmet@sunsite.dk>2007-05-31 15:19:37 +0000
commit958dd529d491a563b60a5485bee8094a7b095a99 (patch)
treee3fb2361fe9e2e7912f16a9195d232bd262eb923 /package/haserl
parent2f1893a8e5bbbc3856551d8e792a84ac2fdbc6ba (diff)
downloadbuildroot-958dd529d491a563b60a5485bee8094a7b095a99.tar.gz
buildroot-958dd529d491a563b60a5485bee8094a7b095a99.tar.bz2
Cleanup, get rid of HASERL_WORKDIR, use $@
Diffstat (limited to 'package/haserl')
-rw-r--r--package/haserl/haserl.mk25
1 files changed, 11 insertions, 14 deletions
diff --git a/package/haserl/haserl.mk b/package/haserl/haserl.mk
index fd1880e141..f02a6d486e 100644
--- a/package/haserl/haserl.mk
+++ b/package/haserl/haserl.mk
@@ -7,8 +7,7 @@
HASERL_VERSION=0.8.0
HASERL_SOURCE=haserl-$(HASERL_VERSION).tar.gz
HASERL_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/haserl/
-HASERL_DIR=$(BUILD_DIR)/${shell basename $(HASERL_SOURCE) .tar.gz}
-HASERL_WORKDIR=$(BUILD_DIR)/haserl-$(HASERL_VERSION)
+HASERL_DIR=$(BUILD_DIR)/haserl-$(HASERL_VERSION)
HASERL_CAT:=$(ZCAT)
$(DL_DIR)/$(HASERL_SOURCE):
@@ -16,7 +15,7 @@ $(DL_DIR)/$(HASERL_SOURCE):
$(HASERL_DIR)/.unpacked: $(DL_DIR)/$(HASERL_SOURCE)
$(HASERL_CAT) $(DL_DIR)/$(HASERL_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- touch $(HASERL_DIR)/.unpacked
+ touch $@
$(HASERL_DIR)/.configured: $(HASERL_DIR)/.unpacked
(cd $(HASERL_DIR); rm -rf config.cache; \
@@ -30,26 +29,24 @@ $(HASERL_DIR)/.configured: $(HASERL_DIR)/.unpacked
--prefix=/usr \
--sysconfdir=/etc \
);
- touch $(HASERL_DIR)/.configured
+ touch $@
-$(HASERL_WORKDIR)/src/haserl: $(HASERL_DIR)/.configured
- $(MAKE) CC=$(TARGET_CC) -C $(HASERL_WORKDIR)
+$(HASERL_DIR)/src/haserl: $(HASERL_DIR)/.configured
+ $(MAKE) CC=$(TARGET_CC) -C $(HASERL_DIR)
-$(HASERL_WORKDIR)/.installed: $(HASERL_WORKDIR)/src/haserl
- cp $(HASERL_WORKDIR)/src/haserl $(TARGET_DIR)/usr/bin
- touch $(HASERL_WORKDIR)/.installed
+$(HASERL_DIR)/.installed: $(HASERL_DIR)/src/haserl
+ cp $(HASERL_DIR)/src/haserl $(TARGET_DIR)/usr/bin
+ touch $@
-haserl: uclibc $(HASERL_WORKDIR)/.installed
+haserl: uclibc $(HASERL_DIR)/.installed
haserl-source: $(DL_DIR)/$(HASERL_SOURCE)
haserl-clean:
- @if [ -d $(HASERL_WORKDIR)/Makefile ] ; then \
- $(MAKE) -C $(HASERL_WORKDIR) clean ; \
- fi;
+ -$(MAKE) -C $(HASERL_DIR) clean
haserl-dirclean:
- rm -rf $(HASERL_DIR) $(HASERL_WORKDIR)
+ rm -rf $(HASERL_DIR)
#############################################################
#
# Toplevel Makefile options