summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2012-02-05 22:55:31 +0100
committerAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2012-02-05 22:55:31 +0100
commit2d2e6f75c9f708d3d8331a8a43c4f000a418559a (patch)
tree1146802914571b43c88b277e358dd0ad6f880c63
parent15536298c5ac18daaf6b943ec4a78ac3a0c56b58 (diff)
downloadembtoolkit-2d2e6f75c9f708d3d8331a8a43c4f000a418559a.tar.gz
embtoolkit-2d2e6f75c9f708d3d8331a8a43c4f000a418559a.tar.bz2
embtoolkit-2d2e6f75c9f708d3d8331a8a43c4f000a418559a.tar.xz
Build system: tweak a little embtk_cleanup_pkg macro
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
-rw-r--r--mk/macros.packages.mk65
1 files changed, 24 insertions, 41 deletions
diff --git a/mk/macros.packages.mk b/mk/macros.packages.mk
index 2d9337e..0fd3bf6 100644
--- a/mk/macros.packages.mk
+++ b/mk/macros.packages.mk
@@ -649,52 +649,35 @@ endef
#
# A macro to clean installed packages from sysroot.
# Usage:
-# $(call embtk_cleanup_pkg,PACKAGE)
-#
-define embtk_cleanup_pkg
- $(if $(EMBTK_BUILDSYS_DEBUG),
- $(call embtk_pinfo,"Cleanup $(__embtk_pkg_name)..."))
- $(Q)-if [ "x$(__embtk_pkg_etc)" != "x" ] && [ -e $(SYSROOT)/etc ]; \
- then \
- cd $(SYSROOT)/etc; rm -rf $(__embtk_pkg_etc); \
- fi
- $(Q)-if [ "x$(__embtk_pkg_bins)" != "x" ] && [ -e $(SYSROOT)/usr/bin ]; \
- then \
- cd $(SYSROOT)/usr/bin; rm -rf $(__embtk_pkg_bins); \
- fi
- $(Q)-if [ "x$(__embtk_pkg_sbins)" != "x" ] && \
- [ -e $(SYSROOT)/usr/sbin ]; \
- then \
- cd $(SYSROOT)/usr/sbin; rm -rf $(__embtk_pkg_sbins); \
- fi
- $(Q)-if [ "x$(__embtk_pkg_includes)" != "x" ] && \
- [ -e $(SYSROOT)/usr/include ]; \
- then \
- cd $(SYSROOT)/usr/include; rm -rf $(__embtk_pkg_includes); \
- fi
- $(Q)-if [ "x$(__embtk_pkg_libs)" != "x" ] && \
- [ -e $(SYSROOT)/usr/$(LIBDIR) ]; \
- then \
- cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(__embtk_pkg_libs); \
- fi
- $(Q)-if [ "x$(__embtk_pkg_libexecs)" != "x" ] && \
- [ -e $(SYSROOT)/usr/$(LIBDIR)/libexec ]; \
- then \
- cd $(SYSROOT)/usr/$(LIBDIR)/libexec; \
- rm -rf $(__embtk_pkg_libexecs); \
- fi
- $(Q)-if [ "x$(__embtk_pkg_pkgconfigs)" != "x" ] && \
- [ -e $(SYSROOT)/usr/$(LIBDIR)/pkgconfig ]; \
- then \
- cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; \
- rm -rf $(__embtk_pkg_pkgconfigs); \
- fi
- $(Q)$(if $(__embtk_pkg_usegit)$(__embtk_pkg_usesvn),
+# $(call embtk_cleanup_pkg,pkgname)
+#
+define __embtk_cleanup_pkg
+ $(if $(__embtk_pkg_etc),
+ rm -rf $(addprefix $(SYSROOT)/etc/,$(__embtk_pkg_etc)))
+ $(if $(__embtk_pkg_bins),
+ rm -rf $(addprefix $(SYSROOT)/usr/bin/,$(__embtk_pkg_bins)))
+ $(if $(__embtk_pkg_sbins),
+ rm -rf $(addprefix $(SYSROOT)/usr/sbin/,$(__embtk_pkg_sbins)))
+ $(if $(__embtk_pkg_includes),
+ rm -rf $(addprefix $(SYSROOT)/usr/include/,$(__embtk_pkg_includes)))
+ $(if $(__embtk_pkg_libs),
+ rm -rf $(addprefix $(SYSROOT)/usr/$(LIBDIR)/,$(__embtk_pkg_libs)))
+ $(if $(__embtk_pkg_libexecs),
+ rm -rf $(addprefix $(SYSROOT)/usr/libexec/,$(__embtk_pkg_libexecs)))
+ $(if $(__embtk_pkg_pkgconfigs),
+ rm -rf $(addprefix $(SYSROOT)/usr/$(LIBDIR)/pkgconfig/,$(__embtk_pkg_pkgconfigs)))
+ $(if $(__embtk_pkg_usegit)$(__embtk_pkg_usesvn),
rm -rf $(__embtk_pkg_dotconfigured_f)
rm -rf $(__embtk_pkg_dotinstalled_f),
rm -rf $(__embtk_pkg_builddir)*)
endef
+define embtk_cleanup_pkg
+ $(if $(EMBTK_BUILDSYS_DEBUG),
+ $(call embtk_pinfo,"Cleanup $(__embtk_pkg_name)..."))
+ $(Q)$(call __embtk_cleanup_pkg,$(1))
+endef
+
#
# Implicit rule to print a package and its dependencies kconfig entries.
#