summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHamish Moffatt <hamish@cloud.net.au>2008-09-04 02:34:42 +0000
committerHamish Moffatt <hamish@cloud.net.au>2008-09-04 02:34:42 +0000
commit7b759f0910e807f5ffda781396260044480d4810 (patch)
tree277d8921a85bf7076bb3f6bd3c5984eb41bb0f1c
parentea8e74bcbee337c2034ac6aa78908caa9129a908 (diff)
Make the autotools xyz-clean target call xyz-uninstall first, rather than duplicating its actions
-rw-r--r--package/Makefile.autotools.in7
1 files changed, 2 insertions, 5 deletions
diff --git a/package/Makefile.autotools.in b/package/Makefile.autotools.in
index 3997e5fe3..7b5f516b8 100644
--- a/package/Makefile.autotools.in
+++ b/package/Makefile.autotools.in
@@ -247,10 +247,6 @@ $(BUILD_DIR)/%/.stamp_target_installed:
$(BUILD_DIR)/%/.stamp_cleaned:
$(call MESSAGE,"Cleaning up")
- -$($(PKG)_MAKE_ENV) $(MAKE) $($(PKG)_UNINSTALL_STAGING_OPT) -C $(@D)/$($(PKG)_SUBDIR)
- rm -f $(@D)/.stamp_staging_installed
- -$($(PKG)_MAKE_ENV) $(MAKE) $($(PKG)_UNINSTALL_TARGET_OPT) -C $(@D)/$($(PKG)_SUBDIR)
- rm -f $(@D)/.stamp_target_installed
-$($(PKG)_MAKE_ENV) $(MAKE) $($(PKG)_CLEAN_OPT) -C $(@D)/$($(PKG)_SUBDIR)
rm -f $(@D)/.stamp_built
@@ -368,7 +364,8 @@ $(1)-source: $$($(2)_TARGET_SOURCE)
# non-build targets
$(1)-uninstall: $(1)-configure $$($(2)_TARGET_UNINSTALL)
-$(1)-clean: $$($(2)_TARGET_CLEAN)
+$(1)-clean: $(1)-uninstall \
+ $$($(2)_TARGET_CLEAN)
$(1)-dirclean: $$($(2)_TARGET_DIRCLEAN)