diff options
| -rwxr-xr-x | trunk/simplepkg.SlackBuild | 2 | ||||
| -rwxr-xr-x | trunk/src/mkbuild | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/trunk/simplepkg.SlackBuild b/trunk/simplepkg.SlackBuild index a95f385..08a8db4 100755 --- a/trunk/simplepkg.SlackBuild +++ b/trunk/simplepkg.SlackBuild @@ -18,7 +18,7 @@ PACKAGE="simplepkg" PACK_DIR="package-$PACKAGE" BUILD=${BUILD:=1rha} -VERSION="0.6pre15" +VERSION="0.6pre16" ARCH="noarch" LIBEXEC="/usr/libexec/$PACKAGE" BINDIR="/usr/bin" diff --git a/trunk/src/mkbuild b/trunk/src/mkbuild index 38cc78d..cddfa5d 100755 --- a/trunk/src/mkbuild +++ b/trunk/src/mkbuild @@ -616,7 +616,11 @@ function load_parameters { # Load Createpkg parameters SLACKBUILDS_DIR="`eval_parameter SLACKBUILDS_DIR /var/simplaret/slackbuilds`" + [ ! -d $SLACKBUILDS_DIR ] && mkdir -p $SLACKBUILDS_DIR + MKBUILDS_DIR="`eval_parameter MKBUILDS_DIR /var/simplaret/mkbuilds`" + [ ! -d $SLACKBUILDS_DIR ] && mkdir -p $SLACKBUILDS_DIR + SLACKBUILDS_SVN="`eval_parameter SLACKBUILDS_DIR svn://slack.sarava.org/slackbuilds`" MKBUILDS_SVN="`eval_parameter MKBUILDS_SVN svn://slack.sarava.org/mkbuilds`" @@ -806,6 +810,7 @@ case $ACTION in # SlackBuild path # SlackBuild path in mkbuild parameters file + SLACKBUILD=${PKG_NAME}.SlackBuild SLACKBUILD_PATH=`get_slackbuild_path` [ $VERBOSE -eq $on ] && echo "[[SLACKBUILD PATH]]=\"$SLACKBUILD_PATH\"" @@ -813,7 +818,6 @@ case $ACTION in #- Start build SlackBuild - #-------------------------------------------------------------- [ $VERBOSE -eq $on ] && echo -e "\nStart SlackBuild make" - SLACKBUILD=${PKG_NAME}.SlackBuild SLACKBUILD_TEMP=$SLACKBUILD.tmp cp $MODEL_DIR/$MODEL $SLACKBUILD_TEMP |