From 6a3a89a8c0982ba0d7ae07e289fc4324c5c81e7b Mon Sep 17 00:00:00 2001
From: mainzelm <mainzelm>
Date: Sat, 22 Nov 2003 19:38:14 +0000
Subject: [PATCH] Install libraries into architecture-dependent directory

---
 c/xlib/Makefile.am     | 2 +-
 configure.in           | 2 ++
 scheme/Makefile.am     | 4 ++--
 scheme/load-scx.scm.in | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/c/xlib/Makefile.am b/c/xlib/Makefile.am
index 855e41e..bab05ec 100644
--- a/c/xlib/Makefile.am
+++ b/c/xlib/Makefile.am
@@ -1,7 +1,7 @@
 INCLUDES = -I@top_srcdir@/c/xlib -I@top_srcdir@/c/libs -I@x_includes@ \
 	-I@top_srcdir@/c -I@scsh_includes@
 
-pkglib_LTLIBRARIES = libscx.la
+libsys_LTLIBRARIES = libscx.la
 
 libscx_la_SOURCES = \
         client.c colormap.c cursor.c display.c error.c event-types.c \
diff --git a/configure.in b/configure.in
index 91f6374..017eaa8 100644
--- a/configure.in
+++ b/configure.in
@@ -60,6 +60,8 @@
 
 	#if no_x == 'yes' fail ...
 
+        libsysdir="${prefix}/lib/`uname -m`-`uname -s`"
+        AC_SUBST(libsysdir)
 	AC_SUBST(LIBS)
 	AC_SUBST(CC)
 	AC_SUBST(x_includes)
diff --git a/scheme/Makefile.am b/scheme/Makefile.am
index 18418ea..de8564e 100644
--- a/scheme/Makefile.am
+++ b/scheme/Makefile.am
@@ -44,10 +44,10 @@ CLEANFILES= load-scx.scm
 
 load-scx.scm: $(srcdir)/load-scx.scm.in
 	sed -e "s|@scxdatadir@|`pwd`/$(srcdir)|g" \
-	    -e "s|@scxlibdir@|`pwd`/../c/xlib/.libs|g" $< > $@
+	    -e "s|@scxlibsysdir@|`pwd`/../c/xlib/.libs|g" $< > $@
 
 install-data-hook:
 	sed -e "s|@scxdatadir@|$(pkgdatadir)|g" \
-	    -e "s|@scxlibdir@|$(pkglibdir)|g" \
+	    -e "s|@scxlibsysdir@|$(libsysdir)|g" \
 		$(srcdir)/load-scx.scm.in \
 		> $(DESTDIR)/$(pkgdatadir)/load-scx.scm
diff --git a/scheme/load-scx.scm.in b/scheme/load-scx.scm.in
index b6995d4..3851ca0 100644
--- a/scheme/load-scx.scm.in
+++ b/scheme/load-scx.scm.in
@@ -3,7 +3,7 @@
 (open 'dynamic-externals)
 (open 'external-calls)
 (run '(let ((initializer-name "scx_init_xlib")
-            (module-file "@scxlibdir@/libscx.so"))
+            (module-file "@scxlibsysdir@/libscx.so"))
         (dynamic-load module-file)
         (call-external (get-external initializer-name))))
 (config)