From 5f631dc3ab9adc23f29573e5772088360dd24707 Mon Sep 17 00:00:00 2001 From: rhatto Date: Mon, 3 Dec 2007 22:50:10 +0000 Subject: simplaret: deleted simplaret_distro_folder; also solved #11; small changes at generic.mkSlackBuild git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@466 04377dda-e619-0410-9926-eae83683ac58 --- trunk/mkbuild/generic.mkSlackBuild | 8 ++++++-- trunk/mkbuild/perl.mkSlackBuild | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) (limited to 'trunk/mkbuild') diff --git a/trunk/mkbuild/generic.mkSlackBuild b/trunk/mkbuild/generic.mkSlackBuild index 7653210..cc388d6 100644 --- a/trunk/mkbuild/generic.mkSlackBuild +++ b/trunk/mkbuild/generic.mkSlackBuild @@ -219,7 +219,11 @@ fi # Install documentation DOCS="[[DOCUMENTATION FILES]]" mkdir -p "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION" || exit $ERROR_MKDIR -cp -a $DOCS "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION" +for doc in $DOCS; do + if [ -f "$doc" ]; then + cp -a $doc "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION" + fi +done off @@ -268,6 +272,6 @@ makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERRO off # Delete source and build directories if requested if [ "$CLEANUP" == "yes" ]; then - rm -rf "$PKG_SRC" "$PKG" + rm -rf "$PKG_SRC" "$PKG" "$PKG_WORK"" fi diff --git a/trunk/mkbuild/perl.mkSlackBuild b/trunk/mkbuild/perl.mkSlackBuild index 0192ed5..323c515 100644 --- a/trunk/mkbuild/perl.mkSlackBuild +++ b/trunk/mkbuild/perl.mkSlackBuild @@ -231,7 +231,11 @@ fi # Install documentation DOCS="[[DOCUMENTATION FILES]]" mkdir -p "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION" || exit $ERROR_MKDIR -cp -a $DOCS "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION" +for doc in $DOCS; do + if [ -f "$doc" ]; then + cp -a $doc "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION" + fi +done off @@ -280,6 +284,6 @@ makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERRO off # Delete source and build directories if requested if [ "$CLEANUP" == "yes" ]; then - rm -rf "$PKG_SRC" "$PKG" + rm -rf "$PKG_SRC" "$PKG" "$PKG_WORK" fi -- cgit v1.2.3