linux-srcdir-mapfile-20051210
authorChas Williams <chas@cmf.nrl.navy.mil>
Sat, 10 Dec 2005 18:28:03 +0000 (18:28 +0000)
committerRuss Allbery <rra@stanford.edu>
Sat, 10 Dec 2005 18:28:03 +0000 (18:28 +0000)
FIXES 23317

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

src/shlibafsauthent/Makefile.in
src/shlibafsrpc/Makefile.in
src/sys/Makefile.in

index c2482bb..6a2ee22 100644 (file)
@@ -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
index 1ef9430..4cc0cb4 100644 (file)
@@ -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
index fa40c01..cbfc54a 100644 (file)
@@ -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} \