Contents of /trunk/xerces-c/patches/xerces-c-2.7.0-multilib.patch
Parent Directory | Revision Log
Revision 442 -
(show annotations)
(download)
Thu Jan 10 14:13:17 2008 UTC (16 years, 8 months ago) by niro
File size: 3267 byte(s)
Thu Jan 10 14:13:17 2008 UTC (16 years, 8 months ago) by niro
File size: 3267 byte(s)
-multlib fixes
1 | diff --exclude-from=/home/dang/.diffrc -u -ruN xerces-c-src.orig/obj/Makefile.in xerces-c-src/obj/Makefile.in |
2 | --- xerces-c-src.orig/obj/Makefile.in 2005-08-26 12:19:57.000000000 -0400 |
3 | +++ xerces-c-src/obj/Makefile.in 2005-10-04 12:01:33.000000000 -0400 |
4 | @@ -46,6 +46,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 | @@ -223,26 +224,26 @@ |
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 (${PLATFORM}, CYGWIN) |
19 | -mkdir -p ${DESTDIR}${PREFIX}/bin |
20 | $(CP) ${FQ_SO_NAME} ${DESTDIR}${PREFIX}/bin |
21 | - $(CP) $(XML_LIB_DIR)/${LIBNAME}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a ${DESTDIR}${PREFIX}/lib |
22 | - (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) |
23 | + $(CP) $(XML_LIB_DIR)/${LIBNAME}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a ${DESTDIR}${PREFIX}/${MLIBDIR} |
24 | + (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) |
25 | |
26 | $(CP) ${FQ_SO_DEPDOM} ${DESTDIR}${PREFIX}/bin |
27 | - $(CP) $(XML_LIB_DIR)/${LIBDEPDOM}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a ${DESTDIR}${PREFIX}/lib |
28 | - (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) |
29 | + $(CP) $(XML_LIB_DIR)/${LIBDEPDOM}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a ${DESTDIR}${PREFIX}/${MLIBDIR} |
30 | + (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) |
31 | else |
32 | - $(CP) ${FQ_REAL_NAME} ${DESTDIR}$(PREFIX)/lib |
33 | - (cd ${DESTDIR}$(PREFIX)/lib; rm -f ${SO_NAME}; ln -s ${REAL_NAME} ${SO_NAME}; rm -f ${LINK_NAME}; ln -s ${REAL_NAME} ${LINK_NAME}) |
34 | + $(CP) ${FQ_REAL_NAME} ${DESTDIR}$(PREFIX)/${MLIBDIR} |
35 | + (cd ${DESTDIR}$(PREFIX)/${MLIBDIR}; rm -f ${SO_NAME}; ln -s ${REAL_NAME} ${SO_NAME}; rm -f ${LINK_NAME}; ln -s ${REAL_NAME} ${LINK_NAME}) |
36 | |
37 | - $(CP) ${FQ_REAL_DEPDOM} ${DESTDIR}$(PREFIX)/lib |
38 | - (cd ${DESTDIR}$(PREFIX)/lib; rm -f ${SO_DEPDOM}; ln -s ${REAL_DEPDOM} ${SO_DEPDOM}; rm -f ${LINK_DEPDOM}; ln -s ${REAL_DEPDOM} ${LINK_DEPDOM}) |
39 | + $(CP) ${FQ_REAL_DEPDOM} ${DESTDIR}$(PREFIX)/${MLIBDIR} |
40 | + (cd ${DESTDIR}$(PREFIX)/${MLIBDIR}; rm -f ${SO_DEPDOM}; ln -s ${REAL_DEPDOM} ${SO_DEPDOM}; rm -f ${LINK_DEPDOM}; ln -s ${REAL_DEPDOM} ${LINK_DEPDOM}) |
41 | endif |
42 | ifeq (${PLATFORM},OS390) |
43 | - $(CP) ${LIBNAME}${VER}${OS390SIDEDECK} ${DESTDIR}$(PREFIX)/lib |
44 | - $(CP) ${LIBDEPDOM}${VER}${OS390SIDEDECK} ${DESTDIR}$(PREFIX)/lib |
45 | + $(CP) ${LIBNAME}${VER}${OS390SIDEDECK} ${DESTDIR}$(PREFIX)/${MLIBDIR} |
46 | + $(CP) ${LIBDEPDOM}${VER}${OS390SIDEDECK} ${DESTDIR}$(PREFIX)/${MLIBDIR} |
47 | endif |
48 | endif |
49 |