From 82b3ad92db039d39b7a87dc6e87d0852629260e1 Mon Sep 17 00:00:00 2001
From: sletz <sletz@0c269be4-1314-0410-8aa9-9f06e86f4224>
Date: Thu, 18 Oct 2007 09:24:20 +0000
Subject: [PATCH] Use _X86_64 for 64 bits related compilation (drivers
 location). More generic Linux script.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@1621 0c269be4-1314-0410-8aa9-9f06e86f4224
---
 ChangeLog                   |  4 ++++
 common/JackDriverLoader.cpp | 11 ++++++++++-
 linux/Makefile              | 33 +++++++++++++++++----------------
 3 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5d136eef..2b36041e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,10 @@ Tom Szilagyi
   Jackdmp changes log
 ---------------------------
 
+2007-10-18 Stephane Letz  <letz@grame.fr>
+
+	* Use _X86_64 for 64 bits related compilation (drivers location). More generic Linux script.
+
 2007-10-16 Stephane Letz  <letz@grame.fr>
 
 	* Reorganize jack headers. Improve Linux install/remove scripts.
diff --git a/common/JackDriverLoader.cpp b/common/JackDriverLoader.cpp
index 8e547a7a..7419a7c7 100644
--- a/common/JackDriverLoader.cpp
+++ b/common/JackDriverLoader.cpp
@@ -274,7 +274,11 @@ jack_drivers_get_descriptor (JSList * drivers, const char * sofile)
     }
 #else
 	char driver_dir[512];
-	snprintf(driver_dir,  sizeof(driver_dir) - 1, "%s/lib/jackmp", ADDON_DIR);
+	#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
 #endif
 
     filename = (char *)malloc(strlen (driver_dir) + 1 + strlen(sofile) + 1);
@@ -407,7 +411,12 @@ 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
 
     /* search through the driver_dir and add get descriptors
     from the .so files in it */
diff --git a/linux/Makefile b/linux/Makefile
index d287145c..e2e1f818 100644
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -2,6 +2,7 @@
 # Choose the installation location
 prefix := /usr/local
 prefix := ${DESTDIR}${prefix}
+libdir := lib
 
 subprojects := ../common ../common/jack ../tests ../example-clients alsa freebob
 
@@ -114,18 +115,18 @@ $(TARGET_LINUX_DUMMY) : $(objects_linux_dummy)
 # Install jackdmp and overwrite jack installation
 install:
 	cp jackdmp $(prefix)/bin
-	cp libjackmp.so $(prefix)/lib
-	cp libjackdmp.so $(prefix)/lib
-	install -d $(prefix)/lib/jackmp/
-	cp jack_alsa.so $(prefix)/lib/jackmp
-	cp jack_dummy.so $(prefix)/lib/jackmp
-	[ -f jack_freebob.so ]  && cp jack_freebob.so $(prefix)/lib/jackmp || echo "freebob driver not installed"
-	cd $(prefix)/lib && [ -f libjack.so.0.0.23 ] && mv -f libjack.so.0.0.23 tmp_libjack.so.0.0.23 || echo "Jack not found, continue..."
+	cp libjackmp.so $(prefix)/$(libdir)
+	cp libjackdmp.so $(prefix)/$(libdir)
+	install -d $(prefix)/$(libdir)/jackmp/
+	cp jack_alsa.so $(prefix)/$(libdir)/jackmp
+	cp jack_dummy.so $(prefix)/$(libdir)/jackmp
+	[ -f jack_freebob.so ]  && cp jack_freebob.so $(prefix)/$(libdir)/jackmp || echo "freebob driver not installed"
+	cd $(prefix)/$(libdir) && [ -f libjack.so.0.0.23 ] && mv -f libjack.so.0.0.23 tmp_libjack.so.0.0.23 || echo "Jack not found, continue..."
 	cd $(prefix)/bin && [ -f jackd ]  && mv -f jackd tmp_jackd || echo "jackd server not found" 
-	cd $(prefix)/lib && rm -f libjack.so*
-	cd $(prefix)/lib && ln -s libjackmp.so  libjack.so
-	cd $(prefix)/lib && ln -s libjackmp.so  libjack.so.0
-	cd $(prefix)/bin && ln -s jackdmp jackd
+	cd $(prefix)/$(libdir) && rm -f libjack.so*
+	cd $(prefix)/$(libdir) && ln -s libjackmp.so  libjack.so
+	cd $(prefix)/$(libdir) && ln -s libjackmp.so  libjack.so.0
+	cd $(prefix)/$(libdir) && ln -s jackdmp jackd
 	/sbin/ldconfig
 
 # Remove jackdmp and tries to restore jack
@@ -133,11 +134,11 @@ uninstall: remove
 
 remove:
 	rm $(prefix)/bin/jackdmp
-	rm $(prefix)/lib/libjackmp.so
-	rm $(prefix)/lib/libjackdmp.so
-	rm -r $(prefix)/lib/jackmp
-	cd $(prefix)/lib && rm -f libjack.so*
-	cd $(prefix)/lib && [ -f tmp_libjack.so.0.0.23 ] && mv -f tmp_libjack.so.0.0.23 libjack.so.0.0.23 \
+	rm $(prefix)/$(libdir)/libjackmp.so
+	rm $(prefix)/$(libdir)/libjackdmp.so
+	rm -r $(prefix)/$(libdir)/jackmp
+	cd $(prefix)/$(libdir) && rm -f libjack.so*
+	cd $(prefix)/$(libdir) && [ -f tmp_libjack.so.0.0.23 ] && mv -f tmp_libjack.so.0.0.23 libjack.so.0.0.23 \
 	&& ln -s libjack.so.0.0.23  libjack.so && ln -s libjack.so.0.0.23  libjack.so.0 || echo "libjack not restored"
 	cd $(prefix)/bin && [ -f tmp_jackd ] && mv -f tmp_jackd jackd || echo "jackd server not restored"
 	/sbin/ldconfig