From 7880ab744b2bd6089a72d9408885cc51dc4b2649 Mon Sep 17 00:00:00 2001
From: "Cameron (Kamran) Mashayekhi" <cmashayekhi@novell.com>
Date: Tue, 3 Jan 2006 23:04:15 +0000
Subject: [PATCH] Fixed the platform parameter ($ARC) for the rpath in link.lux
 files that was causing failures in Germany.

---
 CASA.changes                         | 6 ++++++
 auth_token/PAM/link.lux              | 4 ++--
 auth_token/krb5_token/linux/link.lux | 4 ++--
 auth_token/linux/link.lux            | 4 ++--
 c_jwrapper/jnsscs/link.lux           | 2 +-
 c_micasadk/link.lux                  | 4 ++--
 login_capture/PAM/link.lux           | 4 ++--
 7 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/CASA.changes b/CASA.changes
index b68cf6ae..35cb68c4 100644
--- a/CASA.changes
+++ b/CASA.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jan  3 16:01:10 MST 2006 - cmashayekhi@novell.com
+
+- Fixed link.lux files to use $ARC parameter to eliminate the
+  errors caused during the build with the rpath link parameter. 
+
 -------------------------------------------------------------------
 Thu Dec 22 14:37:04 MST 2005 - jnorman@novell.com
 
diff --git a/auth_token/PAM/link.lux b/auth_token/PAM/link.lux
index 9d73ec0f..230db8b0 100644
--- a/auth_token/PAM/link.lux
+++ b/auth_token/PAM/link.lux
@@ -2,8 +2,8 @@ LINK = $(CC) \
 	-Wl,-Bsymbolic \
 	-shared \
 	-Wl,--version-script=$(TARGET)_$(PLAT).exp \
-	-Wl,-rpath -Wl,/usr/$(ARCH_LlB) \
-	-L/usr/$(ARCH_LIB) -lpthread -lc -lpam -lcasa_auth_token\
+	-Wl,-rpath -Wl,/usr/lib$(ARC) \
+	-L/usr/lib$(ARC) -lpthread -lc -lpam -lcasa_auth_token\
 	-Wl,-soname -Wl,$(TARGET).so \
 	-o $(LIBDIR)$(XTRA)/$(TARGET).so \
 	-L$(LIBDIR)$(XTRA)  \
diff --git a/auth_token/krb5_token/linux/link.lux b/auth_token/krb5_token/linux/link.lux
index 20459938..77562095 100644
--- a/auth_token/krb5_token/linux/link.lux
+++ b/auth_token/krb5_token/linux/link.lux
@@ -2,8 +2,8 @@ LINK = $(CC) \
 	-Wl,-Bsymbolic \
 	-shared \
 	-Wl,--version-script=$(TARGET)_$(PLAT).exp \
-	-Wl,-rpath -Wl,/usr/$(ARCH_LlB) \
-	-L/usr/$(ARCH_LIB) -lpthread -lc -lgssapi \
+	-Wl,-rpath -Wl,/usr/lib$(ARC) \
+	-L/usr/lib$(ARC) -lpthread -lc -lgssapi \
 	-Wl,-soname -Wl,$(TARGET).so \
 	-o $(LIBDIR)$(XTRA)/$(TARGET).so \
 	-L$(LIBDIR)$(XTRA)  \
diff --git a/auth_token/linux/link.lux b/auth_token/linux/link.lux
index bc81f42f..5523c5b6 100644
--- a/auth_token/linux/link.lux
+++ b/auth_token/linux/link.lux
@@ -2,8 +2,8 @@ LINK = $(CC) \
 	-Wl,-Bsymbolic \
 	-shared \
 	-Wl,--version-script=$(TARGET)_$(PLAT).exp \
-	-Wl,-rpath -Wl,/usr/$(ARCH_LlB) \
-	-L/usr/$(ARCH_LIB) -lpthread -lc -ldl \
+	-Wl,-rpath -Wl,/usr/lib$(ARC) \
+	-L/usr/lib$(ARC) -lpthread -lc -ldl \
 	-Wl,-soname -Wl,$(TARGET).so \
 	-o $(LIBDIR)$(XTRA)/$(TARGET).so \
 	-L$(LIBDIR)$(XTRA)  \
diff --git a/c_jwrapper/jnsscs/link.lux b/c_jwrapper/jnsscs/link.lux
index 0f2c2cc5..642ccf7c 100644
--- a/c_jwrapper/jnsscs/link.lux
+++ b/c_jwrapper/jnsscs/link.lux
@@ -2,7 +2,7 @@ LINK = $(CC) \
 	-Wl,-Bsymbolic \
 	-shared \
 	-Wl,--version-script=$(TARGET)_$(PLAT).exp \
-	-Wl,-rpath -Wl,/usr/lib$(ARCH_DIR) \
+	-Wl,-rpath -Wl,/usr/lib$(ARC) \
 	-L$(LIBDIR)$(XTRA) -lmicasa \
 	-Wl,-soname -Wl,lib$(TARGET).so.$(PROD_NUM) \
 	-o $(LIBDIR)$(XTRA)/lib$(TARGET).so.$(BLD_VER) \
diff --git a/c_micasadk/link.lux b/c_micasadk/link.lux
index 03b2aef0..62016e7c 100644
--- a/c_micasadk/link.lux
+++ b/c_micasadk/link.lux
@@ -2,8 +2,8 @@ LINK = $(CC) \
 	-Wl,-Bsymbolic \
 	-shared \
 	-Wl,--version-script=$(TARGET)_$(PLAT).exp \
-	-Wl,-rpath -Wl,/usr/lib$(ARCH_LIB) \
-	-L/usr/lib$(ARCH_LIB) -lpthread -lc -ldl \
+	-Wl,-rpath -Wl,/usr/lib$(ARC) \
+	-L/usr/lib$(ARC) -lpthread -lc -ldl \
 	-Wl,-soname -Wl,lib$(TARGET).so.$(PROD_NUM) \
 	-o $(LIBDIR)$(XTRA)/lib$(TARGET).so.$(BLD_VER) \
 	-L$(LIBDIR)$(XTRA)  \
diff --git a/login_capture/PAM/link.lux b/login_capture/PAM/link.lux
index 5883c678..7271af97 100644
--- a/login_capture/PAM/link.lux
+++ b/login_capture/PAM/link.lux
@@ -2,8 +2,8 @@ LINK = $(CC) \
 	-Wl,-Bsymbolic \
 	-shared \
 	-Wl,--version-script=$(TARGET)_$(PLAT).exp \
-	-Wl,-rpath -Wl,/usr/$(ARCH_LlB) \
-	-L/usr/$(ARCH_LIB) -lpthread -lc -ldl -lpam \
+	-Wl,-rpath -Wl,/usr/lib$(ARC) \
+	-L/usr/lib$(ARC) -lpthread -lc -ldl -lpam \
 	-Wl,-soname -Wl,$(TARGET).so \
 	-o $(LIBDIR)$(XTRA)/$(TARGET).so \
 	-L$(LIBDIR)$(XTRA)  \