diff options
| author | dcommander <dcommander@632fc199-4ca6-4c93-a231-07263d6284db> | 2012-02-10 03:39:43 +0000 |
|---|---|---|
| committer | dcommander <dcommander@632fc199-4ca6-4c93-a231-07263d6284db> | 2012-02-10 03:39:43 +0000 |
| commit | ddbf3a9102c1c766160af897c581bf3c4c3f65bb (patch) | |
| tree | 2517eaacdf28c27617e5cc7267ca309bcab4039e /release | |
| parent | 32abde92f14bd7bdae2a7077c3f55c375af36fb1 (diff) | |
Move build dir. variables back into makemacpkg to avoid messing up the Solaris packaging system.
git-svn-id: svn://svn.code.sf.net/p/libjpeg-turbo/code/trunk@803 632fc199-4ca6-4c93-a231-07263d6284db
Diffstat (limited to 'release')
| -rw-r--r-- | release/makemacpkg.in | 30 |
1 files changed, 24 insertions, 6 deletions
diff --git a/release/makemacpkg.in b/release/makemacpkg.in index 89a3fd7..6cb4069 100644 --- 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 |