tChange command attributes for compatibility with sbase - mkports - recipes for building multiple softwares with mk(1)
(HTM) git clone git://z3bra.org/mkports
(DIR) Log
(DIR) Files
(DIR) Refs
---
(DIR) commit b3216e162aa64c00b18607bfbde161a87c07d003
(DIR) parent 65b6ed5385efdf14f644eb9acf2c5ef5f4bf9e23
(HTM) Author: z3bra <willyatmailoodotorg>
Date: Tue, 26 Jan 2016 10:51:28 +0100
Change command attributes for compatibility with sbase
Diffstat:
M default.mk | 22 ++++++++++------------
M mkfile | 2 +-
2 files changed, 11 insertions(+), 13 deletions(-)
---
(DIR) diff --git a/default.mk b/default.mk
t@@ -23,12 +23,12 @@ install:QV: build
cleanup:QV: install
cd $destdir
- find . -name '*.la' -delete
- find . -name '*.so' -delete
- find . -name '*.so.*' -delete
- find . -name 'info' -type d -exec rm -r {} +
- find . -name 'doc' -type d -exec rm -r {} +
- find . -name 'pkgconfig' -type d -exec rm -r {} +
+ find . -name '*.la' | xargs rm
+ find . -name '*.so' | xargs rm
+ find . -name '*.so.*' | xargs rm
+ find . -name 'info' -type d | xargs rm -r
+ find . -name 'doc' -type d | xargs rm -r
+ find . -name 'pkgconfig' -type d | xargs rm -r
if [ -d ./share ] && [ -z "$(ls ./share)" ]; then
rmdir ./share
fi
t@@ -59,14 +59,12 @@ fetch-archive:QV:
test -f $archive || curl -LO $url > $archive
rm -rf $pkg-$ver
case $archive in
- *.tar.bz2)
- src=$(bzip2 -cd $archive|tar -xv|sed -n 1p|cut -f1 -d/);;
- *.tar.gz|*.tgz)
- src=$(gzip -cd $archive|tar -xv|sed -n 1p|cut -f1 -d/);;
- *.tar.xz)
- src=$(xz -cd $archive|tar -xv|sed -n 1p|cut -f1 -d/);;
+ *.tar.bz2) opt="-xvj" ;;
+ *.tar.gz|*.tgz) opt="-xvz" ;;
+ *.tar.xz) opt="-xvJ" ;;
*) echo "$archive: format not recognized" >&2; exit 1
esac
+ src=$(tar $opt < $archive|sed -n 1p|cut -f1 -d/)
if [ "$src" != "$pkg-$ver" ]; then
mv "$src" "$pkg-$ver"
fi
(DIR) diff --git a/mkfile b/mkfile
t@@ -1,4 +1,4 @@
-ALL = `{ls | grep -vP '[a-z]*\.mk|mkfile'}
+ALL = `{ls | grep -vE '[a-z]*\.mk|mkfile'}
<config.mk
<deps.mk