aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--trunk/doc/CHANGELOG1
-rwxr-xr-xtrunk/src/mkbuild6
2 files changed, 6 insertions, 1 deletions
diff --git a/trunk/doc/CHANGELOG b/trunk/doc/CHANGELOG
index 791634c..4bd7472 100644
--- a/trunk/doc/CHANGELOG
+++ b/trunk/doc/CHANGELOG
@@ -25,6 +25,7 @@ simplepkg changelog
- PATCH FILES parameter default set to ""
- NUMBER OF PREFIX SLASHES TO STRIP parameter default set to "1"
- change_others_parameters function minor fixe
+ - variable ARCH="noarch" in SlackBuild file, if [[ARCH]]="noarch"
0.6pre11
========
diff --git a/trunk/src/mkbuild b/trunk/src/mkbuild
index 53a8362..38cc78d 100755
--- a/trunk/src/mkbuild
+++ b/trunk/src/mkbuild
@@ -290,7 +290,11 @@ function start_build {
edit_file "DECOMPRESSOR" "$DECOMPRESSOR" $1
edit_file "DECOMPRESSOR TEST FLAG" "$DECOMPRESSOR_TEST_FLAG" $1
edit_file "PROGRAM URL" "$URL" $1
- edit_file "ARCH" "$ARCH" $1
+ if [ "$ARCH" == "noarch" ]; then
+ sed -i 's/^ARCH=.*$/ARCH="noarch"/' $1
+ else
+ edit_file "ARCH" "$ARCH" $1
+ fi
edit_file "NUMBER OF JOBS" "$NUMJOBS" $1
edit_file "VERSION" $VERSION $1
edit_file "SOURCE NAME CONSTRUCTION STRING" "$CONST_STRING" $1