From: Robin Gareus <robin@gareus.org>
Date: Mon, 15 Feb 2016 23:05:26 +0000 (+0100)
Subject: OSX build - ignore order of options (and fix indent on the way)
X-Git-Tag: 4.7~28
X-Git-Url: https://main.carlh.net/gitweb/?p=ardour.git;a=commitdiff_plain;h=92d8e6622d30e1f1debdbf5aa403702d22705bb6

OSX build - ignore order of options (and fix indent on the way)

We call the script with "--nls --public" and not "--public --nls"
--public did unset "WITH_NLS"
---

diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build
index 5e4a1a6a63..f7226bc332 100755
--- a/tools/osx_packaging/osx_build
+++ b/tools/osx_packaging/osx_build
@@ -32,35 +32,34 @@ while [ $# -gt 0 ] ; do
 	# top level build targets
 	#
 
-	--sae) WITH_NLS= ; 
-               SAE=1 ; 
-	       WITH_LADSPA=1; 
-               STRIP= ; 
-	       PRODUCT_PKG_DIR=ArdourSAE ; 
-	       APPNAME=Ardour ;
-	       shift ;;
-	--mixbus) MIXBUS=1; 
-	          WITH_HARRISON_LV2=1 ;
-	          WITH_X42_LV2=1 ;
-	          WITH_NLS=1 ; 
-                  SAE= ; 
-                  WITH_LADSPA=; 
-                  STRIP= ; 
-		  PRODUCT_PKG_DIR=Mixbus;
-		  APPNAME=Mixbus ;
-                  shift ;;
-	--public) WITH_NLS= ; 
-	          SAE= ; 
-                  WITH_LADSPA=1; 
-		  PRODUCT_PKG_DIR=Ardour;
-		  APPNAME=Ardour ;
-		  shift ;;
-	--allinone) SAE= ; 
-	            WITH_NLS= ; 
-		    WITH_LADSPA=1; 
-		    STRIP= ; 
-		    PRODUCT_PKG_DIR=Ardour ;
-		    shift ;;
+	--sae)
+		SAE=1 ;
+		WITH_LADSPA=1;
+		STRIP= ;
+		PRODUCT_PKG_DIR=ArdourSAE ;
+		APPNAME=Ardour ;
+		shift ;;
+	--mixbus) MIXBUS=1;
+		WITH_HARRISON_LV2=1 ;
+		WITH_X42_LV2=1 ;
+		WITH_NLS=1 ;
+		SAE= ;
+		WITH_LADSPA=;
+		STRIP= ;
+		PRODUCT_PKG_DIR=Mixbus;
+		APPNAME=Mixbus ;
+		shift ;;
+	--public)
+		SAE= ;
+		WITH_LADSPA=1;
+		PRODUCT_PKG_DIR=Ardour;
+		APPNAME=Ardour ;
+		shift ;;
+	--allinone) SAE= ;
+		WITH_LADSPA=1;
+		STRIP= ;
+		PRODUCT_PKG_DIR=Ardour ;
+		shift ;;
 	--test) SAE= ; WITH_LADSPA=; STRIP= ; shift ;;
 
 	#