diff -Naur xerces-c-src_2_8_0/obj/Makefile.in xerces-c-src_2_8_0-magellan/obj/Makefile.in --- xerces-c-src_2_8_0/obj/Makefile.in 2007-08-28 20:47:18.000000000 +0200 +++ xerces-c-src_2_8_0-magellan/obj/Makefile.in 2008-03-27 13:51:07.000000000 +0100 @@ -49,6 +49,7 @@ include ../src/xercesc/Makefile.incl LIB=${XERCESCROOT}/lib +MLIBDIR=lib ## OS390BATCH ifeq (${OS390BATCH},1) BATCH_TARGET = "//'${LOADMOD}(IXM4C56)'" @@ -253,31 +254,31 @@ ifeq (${OS390BATCH},1) @echo "Nothing to do for OS390BATCH ..." else - -mkdir -p ${DESTDIR}${PREFIX}/lib + -mkdir -p ${DESTDIR}${PREFIX}/${MLIBDIR} ifeq (${LIBTYPE},shared) ifeq (${PLATFORM}, CYGWIN) -mkdir -p ${DESTDIR}${PREFIX}/bin $(CP) ${FQ_SO_NAME} ${DESTDIR}${PREFIX}/bin - $(CP) $(XML_LIB_DIR)/${LIBNAME}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a ${DESTDIR}${PREFIX}/lib - (cd ${DESTDIR}$(PREFIX)/lib; rm -f ${LINK_NAME}.a libxerces.dll.a; ln -s ${LIBNAME}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a ${LINK_NAME}.a; rm -f libxerces.dll.a; ln -s ${LIBNAME}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a libxerces.dll.a) + $(CP) $(XML_LIB_DIR)/${LIBNAME}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a ${DESTDIR}${PREFIX}/${MLIBDIR} + (cd ${DESTDIR}$(PREFIX)/${MLIBDIR}; rm -f ${LINK_NAME}.a libxerces.dll.a; ln -s ${LIBNAME}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a ${LINK_NAME}.a; rm -f libxerces.dll.a; ln -s ${LIBNAME}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a libxerces.dll.a) $(CP) ${FQ_SO_DEPDOM} ${DESTDIR}${PREFIX}/bin - $(CP) $(XML_LIB_DIR)/${LIBDEPDOM}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a ${DESTDIR}${PREFIX}/lib - (cd ${DESTDIR}$(PREFIX)/lib; rm -f ${LINK_DEPDOM}.a libxercesdepdom.dll.a; ln -s ${LIBDEPDOM}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a ${LINK_DEPDOM}.a; rm -f libxercesdepdom.dll.a; ln -s ${LIBDEPDOM}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a libxercesdepdom.dll.a) + $(CP) $(XML_LIB_DIR)/${LIBDEPDOM}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a ${DESTDIR}${PREFIX}/${MLIBDIR} + (cd ${DESTDIR}$(PREFIX)/${MLIBDIR}; rm -f ${LINK_DEPDOM}.a libxercesdepdom.dll.a; ln -s ${LIBDEPDOM}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a ${LINK_DEPDOM}.a; rm -f libxercesdepdom.dll.a; ln -s ${LIBDEPDOM}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a libxercesdepdom.dll.a) else - $(CP) ${FQ_REAL_NAME} ${DESTDIR}$(PREFIX)/lib - (cd ${DESTDIR}$(PREFIX)/lib; rm -f ${SO_NAME}; ln -s ${REAL_NAME} ${SO_NAME}; rm -f ${LINK_NAME}; ln -s ${REAL_NAME} ${LINK_NAME}) + $(CP) ${FQ_REAL_NAME} ${DESTDIR}$(PREFIX)/${MLIBDIR} + (cd ${DESTDIR}$(PREFIX)/${MLIBDIR}; rm -f ${SO_NAME}; ln -s ${REAL_NAME} ${SO_NAME}; rm -f ${LINK_NAME}; ln -s ${REAL_NAME} ${LINK_NAME}) - $(CP) ${FQ_REAL_DEPDOM} ${DESTDIR}$(PREFIX)/lib - (cd ${DESTDIR}$(PREFIX)/lib; rm -f ${SO_DEPDOM}; ln -s ${REAL_DEPDOM} ${SO_DEPDOM}; rm -f ${LINK_DEPDOM}; ln -s ${REAL_DEPDOM} ${LINK_DEPDOM}) + $(CP) ${FQ_REAL_DEPDOM} ${DESTDIR}$(PREFIX)/${MLIBDIR} + (cd ${DESTDIR}$(PREFIX)/${MLIBIDIR}; rm -f ${SO_DEPDOM}; ln -s ${REAL_DEPDOM} ${SO_DEPDOM}; rm -f ${LINK_DEPDOM}; ln -s ${REAL_DEPDOM} ${LINK_DEPDOM}) endif ifeq (${PLATFORM},OS390) - $(CP) ${LIBNAME}${VER}${OS390SIDEDECK} ${DESTDIR}$(PREFIX)/lib - $(CP) ${LIBDEPDOM}${VER}${OS390SIDEDECK} ${DESTDIR}$(PREFIX)/lib + $(CP) ${LIBNAME}${VER}${OS390SIDEDECK} ${DESTDIR}$(PREFIX)/${MLIBDIR} + $(CP) ${LIBDEPDOM}${VER}${OS390SIDEDECK} ${DESTDIR}$(PREFIX)/${MLIBDIR} endif else # shared - $(CP) ${FQ_A_NAME} ${DESTDIR}$(PREFIX)/lib - $(CP) ${FQ_A_DEPDOM} ${DESTDIR}$(PREFIX)/lib + $(CP) ${FQ_A_NAME} ${DESTDIR}$(PREFIX)/${MLIBDIR} + $(CP) ${FQ_A_DEPDOM} ${DESTDIR}$(PREFIX)/${MLIBDIR} endif endif