summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2007-06-28 14:07:13 +0000
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2007-06-28 14:07:13 +0000
commit79e2d802ae7e376a413c02097790493e1f65c3a4 (patch)
tree419b543f2665588ed9cfa7a595648442a8f4ea4a
parent0629a673ae2380274fcc73205ebb19bd5494b786 (diff)
- fix a few -clean targets.
- bash build is not parallel-safe
-rw-r--r--package/at/at.mk3
-rw-r--r--package/bash/bash.mk5
-rw-r--r--package/bison/bison.mk3
-rw-r--r--package/module-init-tools/module-init-tools.mk2
-rw-r--r--package/netsnmp/netsnmp.mk2
5 files changed, 9 insertions, 6 deletions
diff --git a/package/at/at.mk b/package/at/at.mk
index 054325e96..d40289399 100644
--- a/package/at/at.mk
+++ b/package/at/at.mk
@@ -57,7 +57,8 @@ $(TARGET_DIR)/$(AT_TARGET_BINARY): $(AT_DIR)/$(AT_BINARY)
at: uclibc host-fakeroot $(TARGET_DIR)/$(AT_TARGET_BINARY)
at-clean:
- $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(AT_DIR) uninstall
+ -$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(AT_DIR) uninstall
+ rm -f $(TARGET_DIR)/$(AT_TARGET_BINARY) $(TARGET_DIR)/etc/init.d/S99at
-$(MAKE) -C $(AT_DIR) clean
at-dirclean:
diff --git a/package/bash/bash.mk b/package/bash/bash.mk
index 376f05c01..557dbf497 100644
--- a/package/bash/bash.mk
+++ b/package/bash/bash.mk
@@ -59,7 +59,7 @@ $(BASH_DIR)/.configured: $(BASH_DIR)/.unpacked
touch $@
$(BASH_DIR)/$(BASH_BINARY): $(BASH_DIR)/.configured
- $(MAKE) CC=$(TARGET_CC) CC_FOR_BUILD="$(HOSTCC)" -C $(BASH_DIR)
+ $(MAKE1) CC=$(TARGET_CC) CC_FOR_BUILD="$(HOSTCC)" -C $(BASH_DIR)
$(TARGET_DIR)/$(BASH_TARGET_BINARY): $(BASH_DIR)/$(BASH_BINARY)
$(MAKE1) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(BASH_DIR) install
@@ -79,7 +79,8 @@ bash: ncurses uclibc $(TARGET_DIR)/$(BASH_TARGET_BINARY)
endif
bash-clean:
- $(MAKE1) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(BASH_DIR) uninstall
+ -$(MAKE1) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(BASH_DIR) uninstall
+ rm -f $(TARGET_DIR)/$(BASH_TARGET_BINARY)
-$(MAKE1) -C $(BASH_DIR) clean
bash-dirclean:
diff --git a/package/bison/bison.mk b/package/bison/bison.mk
index 2a764e0eb..cdc78eadd 100644
--- a/package/bison/bison.mk
+++ b/package/bison/bison.mk
@@ -58,7 +58,8 @@ $(TARGET_DIR)/$(BISON_TARGET_BINARY): $(BISON_DIR)/$(BISON_BINARY)
bison: uclibc $(TARGET_DIR)/$(BISON_TARGET_BINARY)
bison-clean:
- $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(BISON_DIR) uninstall
+ -$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(BISON_DIR) uninstall
+ rm -f $(TARGET_DIR)/$(BISON_TARGET_BINARY)
-$(MAKE) -C $(BISON_DIR) clean
bison-dirclean:
diff --git a/package/module-init-tools/module-init-tools.mk b/package/module-init-tools/module-init-tools.mk
index 55454a49b..e2c2c1b11 100644
--- a/package/module-init-tools/module-init-tools.mk
+++ b/package/module-init-tools/module-init-tools.mk
@@ -100,7 +100,7 @@ $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-depmod26: $(MODULE_INIT_TOOLS_DIR2)/$(MODU
cross-depmod26: $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-depmod26
-cross-depmod26-source: $(DL_DIR)/$(MODULE_INIT_TOOLS_SOURCE)
+module-init-tools-source cross-depmod26-source: $(DL_DIR)/$(MODULE_INIT_TOOLS_SOURCE)
cross-depmod26-clean:
rm -f $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-depmod26
diff --git a/package/netsnmp/netsnmp.mk b/package/netsnmp/netsnmp.mk
index a55b20315..26459f8a9 100644
--- a/package/netsnmp/netsnmp.mk
+++ b/package/netsnmp/netsnmp.mk
@@ -103,7 +103,7 @@ netsnmp-headers: $(TARGET_DIR)/usr/include/net-snmp/net-snmp-config.h
netsnmp-source: $(DL_DIR)/$(NETSNMP_SOURCE)
netsnmp-clean:
- $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(NETSNMP_DIR) uninstall
+ $(MAKE) PREFIX=$(TARGET_DIR) INSTALL_PREFIX=$(TARGET_DIR) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(NETSNMP_DIR) uninstall
$(MAKE) -C $(NETSNMP_DIR) clean
rm -rf $(TARGET_DIR)/etc/snmp/{snmpd{,trapd},mib2c*}.conf \
$(TARGET_DIR)/etc/default/snmpd \