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 c2482bb6658447d73a8a3c6e142d3c26ef40c639..6a2ee22dc3c40ca4c5e8445422a40b7e5e2613fe 100644 (file)
--- 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 1ef943097ed7c97c204f69280811144baff7dcad..4cc0cb4c472c130319a08d25c30863aebde4b5c7 100644 (file)
--- 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 46ea938972fd07bc4d967a2c8672594ca83dbba1..06871f7da1aa73ec26a924af7f15ac9a7e3a0626 100644 (file)
--- 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} \