diff options
| author | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2007-12-03 22:50:10 +0000 |
|---|---|---|
| committer | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2007-12-03 22:50:10 +0000 |
| commit | 5f631dc3ab9adc23f29573e5772088360dd24707 (patch) | |
| tree | 0f1f259c063ed67dac418e9dbeb810c70ea6abdb /trunk/mkbuild | |
| parent | 302687070a51d4ea8ce8ebd5ab17324c446fbd06 (diff) | |
| download | simplepkg-5f631dc3ab9adc23f29573e5772088360dd24707.tar.gz simplepkg-5f631dc3ab9adc23f29573e5772088360dd24707.tar.bz2 | |
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
Diffstat (limited to 'trunk/mkbuild')
| -rw-r--r-- | trunk/mkbuild/generic.mkSlackBuild | 8 | ||||
| -rw-r--r-- | trunk/mkbuild/perl.mkSlackBuild | 8 |
2 files changed, 12 insertions, 4 deletions
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 </install_documentation> <slackdesc> off @@ -268,6 +272,6 @@ makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERRO <clean_builds> 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 </clean_builds> 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 </install_documentation> <slackdesc> off @@ -280,6 +284,6 @@ makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERRO <clean_builds> 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 </clean_builds> |