diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2014-01-06 00:13:51 +0100 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2014-01-06 00:13:51 +0100 |
| commit | 9074668252803138e4a45a01a4307078e649055a (patch) | |
| tree | 078eabbd59a1e1ee70961b988807356b740db564 | |
| parent | bc985acd05a01d13b2ab5414b68109cadc92946d (diff) | |
| download | embtoolkit-9074668252803138e4a45a01a4307078e649055a.tar.gz embtoolkit-9074668252803138e4a45a01a4307078e649055a.tar.bz2 embtoolkit-9074668252803138e4a45a01a4307078e649055a.tar.xz | |
Build system: simplify a little embtk_decompress_pkg macros
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
| -rw-r--r-- | mk/macros.packages.mk | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/mk/macros.packages.mk b/mk/macros.packages.mk index b572079..9a4d800 100644 --- a/mk/macros.packages.mk +++ b/mk/macros.packages.mk @@ -731,27 +731,19 @@ __embtk_decompress_pkg = \ case $(__embtk_pkg_package_f) in \ *.tar.bz2 | *.tbz2) \ tar -C $(dir $(__embtk_pkg_srcdir)) -xjf \ - $(__embtk_pkg_package_f) && \ - mkdir -p $(__embtk_pkg_builddir) && \ - touch $(__embtk_pkg_dotdecompressed_f) \ + $(__embtk_pkg_package_f) \ ;; \ *.tar.gz | *.tgz) \ tar -C $(dir $(__embtk_pkg_srcdir)) -xzf \ - $(__embtk_pkg_package_f) && \ - mkdir -p $(__embtk_pkg_builddir) && \ - touch $(__embtk_pkg_dotdecompressed_f) \ + $(__embtk_pkg_package_f) \ ;; \ *.tar.xz) \ tar -C $(dir $(__embtk_pkg_srcdir)) -xJf \ - $(__embtk_pkg_package_f) && \ - mkdir -p $(__embtk_pkg_builddir) && \ - touch $(__embtk_pkg_dotdecompressed_f) \ + $(__embtk_pkg_package_f) \ ;; \ *.tar) \ tar -C $(dir $(__embtk_pkg_srcdir)) -xf \ - $(__embtk_pkg_package_f) && \ - mkdir -p $(__embtk_pkg_builddir) && \ - touch $(__embtk_pkg_dotdecompressed_f) \ + $(__embtk_pkg_package_f) \ ;; \ *) \ $(call __embtk_decompress_pkg_exitfailure,$(1)) \ @@ -760,13 +752,14 @@ __embtk_decompress_pkg = \ __embtk_decompress_pkg_msg = $(call embtk_pinfo,"Decrompressing $(__embtk_pkg_package) ...") define embtk_decompress_pkg + $(Q)mkdir -p $(__embtk_pkg_builddir) $(if $(__embtk_pkg_usegit)$(__embtk_pkg_usesvn),true, $(if $(EMBTK_BUILDSYS_DEBUG),$(__embtk_decompress_pkg_msg)) if [ ! -e $(__embtk_pkg_dotdecompressed_f) ]; then \ $(call __embtk_decompress_pkg,$(1)) && \ + touch $(__embtk_pkg_dotdecompressed_f) && \ $(call __embtk_applypatch_pkg,$(1)) \ fi) - $(Q)mkdir -p $(__embtk_pkg_builddir) endef # |