From a9be2a1dba3ca2a3e9d63b8014e35a06b6cbbc32 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Zden=C4=9Bk=20=C5=A0ustr?= <sustr4@cesnet.cz>
Date: Fri, 26 Feb 2010 11:39:25 +0000
Subject: [PATCH] Merge from branch_3795.

---
 org.glite.security.gsoap-plugin/Makefile          | 14 +++++++-------
 org.glite.security.gsoap-plugin/project/ChangeLog |  3 +++
 org.glite.security.gss/Makefile                   | 12 ++++++------
 org.glite.security.gss/project/ChangeLog          |  3 +++
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/org.glite.security.gsoap-plugin/Makefile b/org.glite.security.gsoap-plugin/Makefile
index 9d656e5..11b15d9 100644
--- a/org.glite.security.gsoap-plugin/Makefile
+++ b/org.glite.security.gsoap-plugin/Makefile
@@ -73,10 +73,10 @@ LDFLAGS:=${COVERAGE_FLAGS}
 
 COMPILE:=libtool --mode=compile ${CC} ${CFLAGS}
 COMPILEXX:=libtool --mode=compile ${CXX} ${CFLAGS}
-LINK:=libtool --mode=link ${CC} -rpath ${stagedir}/lib ${LDFLAGS}
-LINKXX:=libtool --mode=link ${CXX} -rpath ${stagedir}/lib ${LDFLAGS}
+LINK:=libtool --mode=link ${CC} -rpath ${stagedir}/${libdir} ${LDFLAGS}
+LINKXX:=libtool --mode=link ${CXX} -rpath ${stagedir}/${libdir} ${LDFLAGS}
 INSTALL:=libtool --mode=install install
-LINK_lang:=PATH=${top_srcdir}/project/libtoolhack:${PATH} libtool --mode=link ${CXX} -rpath ${stagedir}/lib ${LDFLAGS}
+LINK_lang:=PATH=${top_srcdir}/project/libtoolhack:${PATH} libtool --mode=link ${CXX} -rpath ${stagedir}/${libdir} ${LDFLAGS}
 ifeq (${lang},c)
 LINK_lang:=${LINK}
 endif
@@ -84,8 +84,8 @@ ifeq (${lang},cxx)
 LINK_lang:=${LINKXX}
 endif
 
-EX_LIBS:=-L${stagedir}/lib -lglite_security_gss_${nothrflavour}
-EX_THRLIBS:=-L${stagedir}/lib -lglite_security_gss_${thrflavour}
+EX_LIBS:=-L${stagedir}/${libdir} -lglite_security_gss_${nothrflavour}
+EX_THRLIBS:=-L${stagedir}/${libdir} -lglite_security_gss_${thrflavour}
 HDRS:=glite_gsplugin.h glite_gscompat.h glite_gsplugin-int.h
 EXAMPLES:=wscalc_clt_ex wscalc_srv_ex wscalc_srv_ex2
 TESTS:=test_cxx
@@ -228,7 +228,7 @@ stage:
 	$(MAKE) install PREFIX=${stagedir} DOSTAGE=yes
 
 install:
-	-mkdir -p ${PREFIX}/lib
+	-mkdir -p ${PREFIX}/${libdir}
 	-mkdir -p ${PREFIX}/include/glite/security
 	-mkdir -p ${PREFIX}/share/doc/${package}-${version}
 	-mkdir -p ${PREFIX}/include/glite/security/
@@ -243,7 +243,7 @@ install:
 	done
 
 install-soaplib:
-	${INSTALL} -m 755 ${LTLIB_S} ${THRLTLIB_S} ${PREFIX}/lib
+	${INSTALL} -m 755 ${LTLIB_S} ${THRLTLIB_S} ${PREFIX}/${libdir}
 
 clean:
 	rm -rvf ${STATICLIB} ${LTLIB} ${THRSTATICLIB} ${THRLTLIB}
diff --git a/org.glite.security.gsoap-plugin/project/ChangeLog b/org.glite.security.gsoap-plugin/project/ChangeLog
index 6048126..dbcaf8d 100644
--- a/org.glite.security.gsoap-plugin/project/ChangeLog
+++ b/org.glite.security.gsoap-plugin/project/ChangeLog
@@ -22,6 +22,9 @@
 2.0.1-2
 - Module repacked
 
+2.0.1-3
+- install libraries into $libdir
+
 2.0.2-1
 - Updated Makefile & Configure script
 
diff --git a/org.glite.security.gss/Makefile b/org.glite.security.gss/Makefile
index 02fa6e4..12cdf54 100644
--- a/org.glite.security.gss/Makefile
+++ b/org.glite.security.gss/Makefile
@@ -27,7 +27,7 @@ version_info:=-version-info ${shell \
 
 VPATH=${top_srcdir}/src:${top_srcdir}/test
 
-TEST_LIBS:=-L${cppunit_prefix}/lib -lcppunit
+TEST_LIBS:=-L${cppunit_prefix}/${libdir} -lcppunit
 TEST_INC:=-I${cppunit_prefix}/include
 
 default: all
@@ -44,8 +44,8 @@ CFLAGS:= ${DEBUG} \
 LDFLAGS:=${COVERAGE_FLAGS}
 
 COMPILE:=libtool --mode=compile ${CC} ${CFLAGS}
-LINK:=libtool --mode=link ${CC} -rpath ${stagedir}/lib ${LDFLAGS} 
-LINKXX:=libtool --mode=link  ${CXX} -rpath ${stagedir}/lib ${LDFLAGS}
+LINK:=libtool --mode=link ${CC} -rpath ${stagedir}/${libdir} ${LDFLAGS} 
+LINKXX:=libtool --mode=link  ${CXX} -rpath ${stagedir}/${libdir} ${LDFLAGS}
 INSTALL:=libtool --mode=install install
 
 GLOBUS_INC:= -I${globus_prefix}/include/${nothrflavour}
@@ -118,14 +118,14 @@ stage:
 	$(MAKE) install PREFIX=${stagedir} DOSTAGE=yes
 
 install:
-	-mkdir -p ${PREFIX}/lib
+	-mkdir -p ${PREFIX}/${libdir}
 	-mkdir -p ${PREFIX}/share/doc/${package}-${version}
 	-mkdir -p ${PREFIX}/include/glite/security
-	${INSTALL} -m 755 ${GSS_LTLIB} ${GSS_THRLTLIB} ${PREFIX}/lib
+	${INSTALL} -m 755 ${GSS_LTLIB} ${GSS_THRLTLIB} ${PREFIX}/${libdir}
 	${INSTALL} -m 644 ${top_srcdir}/LICENSE ${PREFIX}/share/doc/${package}-${version}
 	cd ${top_srcdir}/interface && ${INSTALL} -m 644 ${HDRS} ${PREFIX}/include/glite/security/
 	if [ x${DOSTAGE} = xyes ]; then \
-		install -m 644 ${GSS_STATICLIB} ${GSS_THRSTATICLIB} ${PREFIX}/lib; \
+		install -m 644 ${GSS_STATICLIB} ${GSS_THRSTATICLIB} ${PREFIX}/${libdir}; \
 	fi
 
 clean:
diff --git a/org.glite.security.gss/project/ChangeLog b/org.glite.security.gss/project/ChangeLog
index 4ac3c12..a0ecbca 100644
--- a/org.glite.security.gss/project/ChangeLog
+++ b/org.glite.security.gss/project/ChangeLog
@@ -13,6 +13,9 @@
 2.0.0-5
 - New age to fix an erroneous lock
 
+2.0.0-6
+- install libraries into $libdir
+
 2.0.1-1
 - Memleak fixes
 - Working with c-ares >= 1.5.0
-- 
1.8.2.3