Move build dir. variables back into makemacpkg to avoid messing up the Solaris packag...

git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/branches/1.2.x@804 632fc199-4ca6-4c93-a231-07263d6284db

diff --git a/Makefile.am b/Makefile.am
index b21acc24faf2505f90be3733e6df3dbe4e636ef5..0fef9fa5d50f2784d1b1b72a13b72f704dc91ac1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -299,10 +299,6 @@ srpm: dist-gzip
 deb: all
        sh pkgscripts/makedpkg
 
-BUILDDIR32=@abs_top_srcdir@/osxx86
-BUILDDIRARMV6=@abs_top_srcdir@/iosarmv6
-BUILDDIRARMV7=@abs_top_srcdir@/iosarmv7
-
 if X86_64
 
 udmg: all

diff --git a/release/makemacpkg.in b/release/makemacpkg.in
index 89a3fd7d675cfbcc7da75b11f5af5405dce4304b..6cb4069d55310903905f9d3369a4cc9c14a5870a 100644 (file)
--- a/release/makemacpkg.in
+++ b/release/makemacpkg.in
@@ -25,16 +25,34 @@ PACKAGE_NAME=@PACKAGE_NAME@
 VERSION=@VERSION@
 BUILD=@BUILD@
 SRCDIR=@abs_top_srcdir@
-BUILDDIR32=
-BUILDDIRARMV6=
-BUILDDIRARMV7=
+BUILDDIR32=@abs_top_srcdir@/osxx86
+BUILDDIRARMV6=@abs_top_srcdir@/iosarmv6
+BUILDDIRARMV7=@abs_top_srcdir@/iosarmv7
 WITH_JAVA=@WITH_JAVA@
 while [ $# -gt 0 ]; do
        case $1 in
        -h*)             usage 0                   ;;
-       -builddir32)     BUILDDIR32=$2;     shift  ;;
-       -builddirarmv6)  BUILDDIRARMV6=$2;  shift  ;;
-       -builddirarmv7)  BUILDDIRARMV7=$2;  shift  ;;
+       -builddir32)
+               if [ $# -gt 1 ]; then
+                       if [[ ! "$2" =~ -.* ]]; then
+                               BUILDDIR32=$2;  shift
+                       fi
+               fi
+               ;;
+       -builddirarmv6)
+               if [ $# -gt 1 ]; then
+                       if [[ ! "$2" =~ -.* ]]; then
+                               BUILDDIRARMV6=$2;  shift
+                       fi
+               fi
+               ;;
+       -builddirarmv7)
+               if [ $# -gt 1 ]; then
+                       if [[ ! "$2" =~ -.* ]]; then
+                               BUILDDIRARMV7=$2;  shift
+                       fi
+               fi
+               ;;
        esac
        shift
 done