Magellan Linux

Contents of /trunk/xerces-c/patches/xerces-c-2.8.0-multilib.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 551 - (show annotations) (download)
Thu Mar 27 12:53:40 2008 UTC (16 years, 1 month ago) by niro
File size: 3520 byte(s)
-re-diffed

1 diff -Naur xerces-c-src_2_8_0/obj/Makefile.in xerces-c-src_2_8_0-magellan/obj/Makefile.in
2 --- xerces-c-src_2_8_0/obj/Makefile.in 2007-08-28 20:47:18.000000000 +0200
3 +++ xerces-c-src_2_8_0-magellan/obj/Makefile.in 2008-03-27 13:51:07.000000000 +0100
4 @@ -49,6 +49,7 @@
5 include ../src/xercesc/Makefile.incl
6
7 LIB=${XERCESCROOT}/lib
8 +MLIBDIR=lib
9 ## OS390BATCH
10 ifeq (${OS390BATCH},1)
11 BATCH_TARGET = "//'${LOADMOD}(IXM4C56)'"
12 @@ -253,31 +254,31 @@
13 ifeq (${OS390BATCH},1)
14 @echo "Nothing to do for OS390BATCH ..."
15 else
16 - -mkdir -p ${DESTDIR}${PREFIX}/lib
17 + -mkdir -p ${DESTDIR}${PREFIX}/${MLIBDIR}
18 ifeq (${LIBTYPE},shared)
19 ifeq (${PLATFORM}, CYGWIN)
20 -mkdir -p ${DESTDIR}${PREFIX}/bin
21 $(CP) ${FQ_SO_NAME} ${DESTDIR}${PREFIX}/bin
22 - $(CP) $(XML_LIB_DIR)/${LIBNAME}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a ${DESTDIR}${PREFIX}/lib
23 - (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)
24 + $(CP) $(XML_LIB_DIR)/${LIBNAME}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a ${DESTDIR}${PREFIX}/${MLIBDIR}
25 + (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)
26
27 $(CP) ${FQ_SO_DEPDOM} ${DESTDIR}${PREFIX}/bin
28 - $(CP) $(XML_LIB_DIR)/${LIBDEPDOM}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a ${DESTDIR}${PREFIX}/lib
29 - (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)
30 + $(CP) $(XML_LIB_DIR)/${LIBDEPDOM}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a ${DESTDIR}${PREFIX}/${MLIBDIR}
31 + (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)
32 else
33 - $(CP) ${FQ_REAL_NAME} ${DESTDIR}$(PREFIX)/lib
34 - (cd ${DESTDIR}$(PREFIX)/lib; rm -f ${SO_NAME}; ln -s ${REAL_NAME} ${SO_NAME}; rm -f ${LINK_NAME}; ln -s ${REAL_NAME} ${LINK_NAME})
35 + $(CP) ${FQ_REAL_NAME} ${DESTDIR}$(PREFIX)/${MLIBDIR}
36 + (cd ${DESTDIR}$(PREFIX)/${MLIBDIR}; rm -f ${SO_NAME}; ln -s ${REAL_NAME} ${SO_NAME}; rm -f ${LINK_NAME}; ln -s ${REAL_NAME} ${LINK_NAME})
37
38 - $(CP) ${FQ_REAL_DEPDOM} ${DESTDIR}$(PREFIX)/lib
39 - (cd ${DESTDIR}$(PREFIX)/lib; rm -f ${SO_DEPDOM}; ln -s ${REAL_DEPDOM} ${SO_DEPDOM}; rm -f ${LINK_DEPDOM}; ln -s ${REAL_DEPDOM} ${LINK_DEPDOM})
40 + $(CP) ${FQ_REAL_DEPDOM} ${DESTDIR}$(PREFIX)/${MLIBDIR}
41 + (cd ${DESTDIR}$(PREFIX)/${MLIBIDIR}; rm -f ${SO_DEPDOM}; ln -s ${REAL_DEPDOM} ${SO_DEPDOM}; rm -f ${LINK_DEPDOM}; ln -s ${REAL_DEPDOM} ${LINK_DEPDOM})
42 endif
43 ifeq (${PLATFORM},OS390)
44 - $(CP) ${LIBNAME}${VER}${OS390SIDEDECK} ${DESTDIR}$(PREFIX)/lib
45 - $(CP) ${LIBDEPDOM}${VER}${OS390SIDEDECK} ${DESTDIR}$(PREFIX)/lib
46 + $(CP) ${LIBNAME}${VER}${OS390SIDEDECK} ${DESTDIR}$(PREFIX)/${MLIBDIR}
47 + $(CP) ${LIBDEPDOM}${VER}${OS390SIDEDECK} ${DESTDIR}$(PREFIX)/${MLIBDIR}
48 endif
49 else # shared
50 - $(CP) ${FQ_A_NAME} ${DESTDIR}$(PREFIX)/lib
51 - $(CP) ${FQ_A_DEPDOM} ${DESTDIR}$(PREFIX)/lib
52 + $(CP) ${FQ_A_NAME} ${DESTDIR}$(PREFIX)/${MLIBDIR}
53 + $(CP) ${FQ_A_DEPDOM} ${DESTDIR}$(PREFIX)/${MLIBDIR}
54 endif
55 endif
56