From 67647eb8287861c3607642253dc694ea1471ec4d Mon Sep 17 00:00:00 2001
From: sletz <sletz@0c269be4-1314-0410-8aa9-9f06e86f4224>
Date: Thu, 18 Oct 2007 10:22:11 +0000
Subject: [PATCH] Define LIB_DIR

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@1625 0c269be4-1314-0410-8aa9-9f06e86f4224
---
 ChangeLog                                |  2 +-
 common/JackDriverLoader.cpp              | 15 +++------------
 linux/Makefile                           |  4 ++--
 macosx/Jackdmp.xcodeproj/project.pbxproj | 15 ++++++++++++---
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2b36041e..06ad74ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,7 +15,7 @@ Tom Szilagyi
 
 2007-10-18 Stephane Letz  <letz@grame.fr>
 
-	* Use _X86_64 for 64 bits related compilation (drivers location). More generic Linux script.
+	* Use LIB_DIR variable for 64 bits related compilation (drivers location). More generic Linux script.
 
 2007-10-16 Stephane Letz  <letz@grame.fr>
 
diff --git a/common/JackDriverLoader.cpp b/common/JackDriverLoader.cpp
index 7419a7c7..e0d16137 100644
--- a/common/JackDriverLoader.cpp
+++ b/common/JackDriverLoader.cpp
@@ -274,11 +274,7 @@ jack_drivers_get_descriptor (JSList * drivers, const char * sofile)
     }
 #else
 	char driver_dir[512];
-	#ifdef _X86_64
-		snprintf(driver_dir,  sizeof(driver_dir) - 1, "%s/lib64/jackmp", ADDON_DIR);
-	#else
-		snprintf(driver_dir,  sizeof(driver_dir) - 1, "%s/lib/jackmp", ADDON_DIR);
-	#endif
+	snprintf(driver_dir,  sizeof(driver_dir) - 1, "%s/%s/jackmp", ADDON_DIR, LIB_DIR);
 #endif
 
     filename = (char *)malloc(strlen (driver_dir) + 1 + strlen(sofile) + 1);
@@ -411,13 +407,8 @@ jack_drivers_load (JSList * drivers) {
 	}
 	*/
 	char driver_dir[512];
-
-#ifdef _X86_64
-	snprintf(driver_dir,  sizeof(driver_dir) - 1, "%s/lib64/jackmp", ADDON_DIR);
-#else
-	snprintf(driver_dir,  sizeof(driver_dir) - 1, "%s/lib/jackmp", ADDON_DIR);
-#endif
-
+	snprintf(driver_dir,  sizeof(driver_dir) - 1, "%s/%s/jackmp", ADDON_DIR, LIB_DIR);
+	
     /* search through the driver_dir and add get descriptors
     from the .so files in it */
     dir_stream = opendir (driver_dir);
diff --git a/linux/Makefile b/linux/Makefile
index 864f13d6..53bd15b9 100644
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -48,10 +48,10 @@ objects_linux_freebob := JackFreebobDriver.o
 objects_linux_dummy := JackDummyDriver.o  
 
 CFLAGS := -g -fPIC -DUSE_POSIX_SHM $(addprefix -I, $(subprojects)) $(CFLAGS)
-CXXFLAGS := -g  -fPIC -DSOCKET_RPC_FIFO_SEMA -D__SMP__ -DADDON_DIR=\"$(prefix)\"  $(addprefix -I, $(subprojects)) $(CXXFLAGS) 
+CXXFLAGS := -g  -fPIC -DSOCKET_RPC_FIFO_SEMA -D__SMP__ -DADDON_DIR=\"$(prefix)\" -DLIB_DIR=\"$(libdir)\" $(addprefix -I, $(subprojects)) $(CXXFLAGS) 
 
 #CFLAGS := -g -fPIC -DUSE_POSIX_SHM $(addprefix -I, $(subprojects)) $(CFLAGS)
-#CXXFLAGS := -g -fPIC -DSOCKET_RPC_FIFO_SEMA -D__SMP__ -DADDON_DIR=\"$(prefix)\" $(addprefix -I, $(subprojects)) $(CXXFLAGS) 
+#CXXFLAGS := -g -fPIC -DSOCKET_RPC_FIFO_SEMA -D__SMP__ -DADDON_DIR=\"$(prefix)\" -DLIB_DIR=\"$(libdir)\" $(addprefix -I, $(subprojects)) $(CXXFLAGS) 
 
 # Use this line to compile with POSIX names semaphore
 #CXXFLAGS := -g -O3 -fPIC -DSOCKET_RPC_POSIX_SEMA -D__SMP__ -DADDON_DIR=\"$(prefix)\"  $(addprefix -I, $(subprojects)) $(CXXFLAGS)
diff --git a/macosx/Jackdmp.xcodeproj/project.pbxproj b/macosx/Jackdmp.xcodeproj/project.pbxproj
index d1e9b9eb..377b2824 100644
--- a/macosx/Jackdmp.xcodeproj/project.pbxproj
+++ b/macosx/Jackdmp.xcodeproj/project.pbxproj
@@ -3048,9 +3048,12 @@
 				OTHER_CPLUSPLUSFLAGS = (
 					"-D__SMP__",
 					"-DMACH_RPC_MACH_SEMA",
-					"$(OTHER_CPLUSPLUSFLAGS_QUOTED_1)",
+					"$(OTHER_CPLUSPLUSFLAGS_QUOTED_2)",
+					"$(OTHER_CPLUSPLUSFLAGS_QUOTED_3)",
 				);
 				OTHER_CPLUSPLUSFLAGS_QUOTED_1 = "-DADDON_DIR=\\\"/usr/local\\\"";
+				OTHER_CPLUSPLUSFLAGS_QUOTED_2 = "-DADDON_DIR=\\\"/usr/local\\\"";
+				OTHER_CPLUSPLUSFLAGS_QUOTED_3 = "-DLIB_DIR=\\\"lib\\\"";
 				OTHER_LDFLAGS = (
 					"-framework",
 					Carbon,
@@ -3101,9 +3104,12 @@
 				OTHER_CPLUSPLUSFLAGS = (
 					"-D__SMP__",
 					"-DMACH_RPC_MACH_SEMA",
-					"$(OTHER_CPLUSPLUSFLAGS_QUOTED_1)",
+					"$(OTHER_CPLUSPLUSFLAGS_QUOTED_2)",
+					"$(OTHER_CPLUSPLUSFLAGS_QUOTED_3)",
 				);
 				OTHER_CPLUSPLUSFLAGS_QUOTED_1 = "-DADDON_DIR=\\\"/usr/local\\\"";
+				OTHER_CPLUSPLUSFLAGS_QUOTED_2 = "-DADDON_DIR=\\\"/usr/local\\\"";
+				OTHER_CPLUSPLUSFLAGS_QUOTED_3 = "-DLIB_DIR=\\\"lib\\\"";
 				OTHER_LDFLAGS = (
 					"-framework",
 					Carbon,
@@ -3152,9 +3158,12 @@
 				OTHER_CPLUSPLUSFLAGS = (
 					"-D__SMP__",
 					"-DMACH_RPC_MACH_SEMA",
-					"$(OTHER_CPLUSPLUSFLAGS_QUOTED_1)",
+					"$(OTHER_CPLUSPLUSFLAGS_QUOTED_2)",
+					"$(OTHER_CPLUSPLUSFLAGS_QUOTED_3)",
 				);
 				OTHER_CPLUSPLUSFLAGS_QUOTED_1 = "-DADDON_DIR=\\\"/usr/local\\\"";
+				OTHER_CPLUSPLUSFLAGS_QUOTED_2 = "-DADDON_DIR=\\\"/usr/local\\\"";
+				OTHER_CPLUSPLUSFLAGS_QUOTED_3 = "-DLIB_DIR=\\\"lib\\\"";
 				OTHER_LDFLAGS = (
 					"-framework",
 					Carbon,