From: Chas Williams <chas@cmf.nrl.navy.mil>
Date: Sat, 10 Dec 2005 18:45:39 +0000 (+0000)
Subject: STABLE14-linux-srcdir-mapfile-20051210
X-Git-Tag: openafs-stable-1_4_1-rc3~23
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=35fabe1f37b2efa17cd373c4e0c57ea08956e9c4;p=packages%2Fo%2Fopenafs.git

STABLE14-linux-srcdir-mapfile-20051210

FIXES 23317

Look for the shared library mapfile in ${srcdir} on Linux to allow for out
of srcdir builds.


(cherry picked from commit 77d0369d3bdeab78b02f306644ddb6133e1a1484)
---

diff --git a/src/shlibafsauthent/Makefile.in b/src/shlibafsauthent/Makefile.in
index c2482bb66..6a2ee22dc 100644
--- a/src/shlibafsauthent/Makefile.in
+++ b/src/shlibafsauthent/Makefile.in
@@ -115,7 +115,7 @@ ${LIBAFSAUTHENT}: ${LIBOBJS}
 	sun*_5*) \
 		${SHLIB_LINKER} -h libafsauthent.${SHLIB_SUFFIX}.${LIBAFSAUTHENTMAJOR} -o ${LIBAFSAUTHENT} ${LIBOBJS} -L${TOP_LIBDIR} -lafsrpc ${MT_LIBS};; \
 	*_linux*) \
-		${SHLIB_LINKER} -Wl,-h,libafsauthent.${SHLIB_SUFFIX}.${LIBAFSAUTHENTMAJOR} -Wl,--version-script=mapfile -o ${LIBAFSAUTHENT} ${LIBOBJS} -L${TOP_LIBDIR} -lafsrpc ${MT_LIBS};; \
+		${SHLIB_LINKER} -Wl,-h,libafsauthent.${SHLIB_SUFFIX}.${LIBAFSAUTHENTMAJOR} -Wl,--version-script=${srcdir}/mapfile -o ${LIBAFSAUTHENT} ${LIBOBJS} -L${TOP_LIBDIR} -lafsrpc ${MT_LIBS};; \
 	*) \
 		${SHLIB_LINKER} -o ${LIBAFSAUTHENT} ${LIBOBJS} -L${TOP_LIBDIR} -lafsrpc ${MT_LIBS};; \
 	esac
diff --git a/src/shlibafsrpc/Makefile.in b/src/shlibafsrpc/Makefile.in
index 1ef943097..4cc0cb4c4 100644
--- a/src/shlibafsrpc/Makefile.in
+++ b/src/shlibafsrpc/Makefile.in
@@ -148,7 +148,7 @@ ${LIBAFSRPC}: ${LIBOBJS}
 	sun*_5*) \
 		${SHLIB_LINKER} -h libafsrpc.${SHLIB_SUFFIX}.${LIBAFSRPCMAJOR} -o ${LIBAFSRPC} ${LIBOBJS} ${MT_LIBS};; \
 	*_linux*) \
-		${SHLIB_LINKER} -Wl,-h,libafsrpc.${SHLIB_SUFFIX}.${LIBAFSRPCMAJOR} -Wl,--version-script=mapfile -o ${LIBAFSRPC} ${LIBOBJS} ${MT_LIBS};; \
+		${SHLIB_LINKER} -Wl,-h,libafsrpc.${SHLIB_SUFFIX}.${LIBAFSRPCMAJOR} -Wl,--version-script=${srcdir}/mapfile -o ${LIBAFSRPC} ${LIBOBJS} ${MT_LIBS};; \
 	*) \
 		${SHLIB_LINKER} -o ${LIBAFSRPC} ${LIBOBJS} ${MT_LIBS};; \
 	esac
diff --git a/src/sys/Makefile.in b/src/sys/Makefile.in
index 46ea93897..06871f7da 100644
--- a/src/sys/Makefile.in
+++ b/src/sys/Makefile.in
@@ -54,7 +54,7 @@ ${LIBAFSSETPAG}: ${SHLIBOBJS}
 	case ${SYS_NAME} in \
 	*_linux*) \
 	    ${SHLIB_LINKER} -Wl,-h,libafssetpag.so.${LIBAFSSETPAGMAJOR} \
-	        -o ${LIBAFSSETPAG} -Wl,--version-script=mapfile \
+	        -o ${LIBAFSSETPAG} -Wl,--version-script=${srcdir}/mapfile \
 	        ${SHLIBOBJS};; \
 	rs_aix4*) \
 	    ${SHLIB_LINKER} -o ${LIBAFSSETPAG} ${SHLIBOBJS} \