Skip to content
Snippets Groups Projects
Commit 14435ceb authored by Raymond Toy's avatar Raymond Toy
Browse files

Solaris /bin/sh doesn't like ${VERSION:+ -v "$VERSION"}. Simplify it.

parent 5de45b3d
No related branches found
No related tags found
No related merge requests found
...@@ -46,7 +46,7 @@ do ...@@ -46,7 +46,7 @@ do
C) CREATE_OPT="$OPTARG" ;; C) CREATE_OPT="$OPTARG" ;;
o) OLDLISP="$OPTARG" ;; o) OLDLISP="$OPTARG" ;;
8) OLD8="$OPTARG" ;; 8) OLD8="$OPTARG" ;;
v) VERSION="$OPTARG" ;; v) VERSION="$OPTARG"; VERSION_SET=true ;;
U) UPDATE_TRANS="-U" ;; U) UPDATE_TRANS="-U" ;;
P) UPDATE_POT="" ;; P) UPDATE_POT="" ;;
\?) usage ;; \?) usage ;;
...@@ -83,16 +83,19 @@ buildx86 () ...@@ -83,16 +83,19 @@ buildx86 ()
buildsun4 () buildsun4 ()
{ {
if [ "$VERSION_SET" = true ]; then
VERS="-v '"$VERSION"'"
fi
# Build non-unicode versions # Build non-unicode versions
if [ -n "$OLD8" ]; then if [ -n "$OLD8" ]; then
set -x set -x
src/tools/build.sh -b ${BASE}-8bit $bootfiles ${VERSION:+-v "$VERSION"} -C "$CREATE_OPT" ${UPDATE_TRANS} ${UPDATE_POT} -o "$OLD8" src/tools/build.sh -b ${BASE}-8bit $bootfiles ${VERS} -C "$CREATE_OPT" ${UPDATE_TRANS} ${UPDATE_POT} -o "$OLD8"
set +x set +x
fi fi
# Build the unicode version. # Build the unicode version.
if [ -n "$OLDLISP" ]; then if [ -n "$OLDLISP" ]; then
set -x set -x
src/tools/build.sh -b ${BASE} $bootfiles ${VERSION:+-v "$VERSION"} -C "$CREATE_OPT" ${UPDATE_TRANS} ${UPDATE_POT} -o "$OLDLISP" src/tools/build.sh -b ${BASE} $bootfiles ${VERS} -C "$CREATE_OPT" ${UPDATE_TRANS} ${UPDATE_POT} -o "$OLDLISP"
set +x set +x
fi fi
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment