dmitryh 2004/09/12 17:57:33
Modified: c Makefile.incl.in
Log:
Fix for JIRA XALANC-422 "Build fails if no ICUROOT set"
Revision Changes Path
1.22 +7 -6 xml-xalan/c/Makefile.incl.in
Index: Makefile.incl.in
===================================================================
RCS file: /home/cvs/xml-xalan/c/Makefile.incl.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Makefile.incl.in 6 Aug 2004 03:15:00 -0000 1.21
+++ Makefile.incl.in 13 Sep 2004 00:57:33 -0000 1.22
@@ -66,6 +66,7 @@
ifndef ICUI18NROOT
ICUI18NROOT=${ICUROOT}
endif
+ ICULIB_LOC=$(ICUROOT)/lib
endif
# required libraries
@@ -146,7 +147,7 @@
OTHER_LINK_LIB_PARAMERES = $(ALLLIBS)
- export PATH := $(XERCESCROOT)/lib:$(ICUROOT)/lib:$(PATH)
+ export PATH := $(XERCESCROOT)/lib:$(ICULIB_LOC):$(PATH)
endif
@@ -186,7 +187,7 @@
LINK_SONAME = -Wl,-soname,$(SO_NAME)
LINK = $(CXX) -D${PLATFORM} ${PIC_OPTION}
- export LD_LIBRARY_PATH :=
$(XERCESCROOT)/lib:$(ICUROOT)/lib:$(LD_LIBRARY_PATH)
+ export LD_LIBRARY_PATH :=
$(XERCESCROOT)/lib:$(ICULIB_LOC):$(LD_LIBRARY_PATH)
MAKE_SHARED_LOC = ${CXX} $(CXXFLAGS) -Wl,-soname,$(LOC_SONAME)
-D${PLATFORM} -shared ${PIC_OPTION}
endif
@@ -263,7 +264,7 @@
LINK_SONAME = -Wl,+h,${SO_NAME}
LINK = $(CXX) $(CXXFLAGS) ${LDFLAGS} $(PLATFORM_COMPILE_OPTIONS)
$(PLATFORM_CXX_COMPILE_OPTIONS) -Wl,+s
- export SHLIB_PATH:=$(XERCESCROOT)/lib:$(ICUROOT)/lib:$(SHLIB_PATH)
+ export SHLIB_PATH:=$(XERCESCROOT)/lib:$(ICULIB_LOC):$(SHLIB_PATH)
MAKE_SHARED_LOC = $(CXX) -b +Z ${LDFLAGS} -Wl,+s -Wl,+h,${LOC_SONAME}
endif
@@ -307,7 +308,7 @@
SHLIBSUFFIX=.so
- export LD_LIBRARY_PATH :=
$(XERCESCROOT)/lib:$(ICUROOT)/lib:$(LD_LIBRARY_PATH)
+ export LD_LIBRARY_PATH :=
$(XERCESCROOT)/lib:$(ICULIB_LOC):$(LD_LIBRARY_PATH)
MAKE_SHARED_LOC = ${CXX} -D${PLATFORM} -G -ptr$(ALL_OBJECTS_DIR)
${LDFLAGS} -h ${LOC_SONAME}
@@ -367,7 +368,7 @@
LIBRARY_LINK_NAME=-l$(PROJECT_NAME)$(LIB_MAJOR_VER)
- export LIBPATH := $(XERCESCROOT)/lib:$(ICUROOT)/lib:$(LIBPATH)
+ export LIBPATH := $(XERCESCROOT)/lib:$(ICULIB_LOC):$(LIBPATH)
MAKE_SHARED_LOC=$(MAKE_SHARED)
LOC_LIB = ${LOC_LIBNAME}${LIB_MAJOR_VER}.${LIB_MINOR_VER}${SHLIBSUFFIX}
LOC_LIBKEYNAME=${LOC_PROJECT_NAME}${LIB_MAJOR_VER}
@@ -457,7 +458,7 @@
MAKE_SHARED = ${CXX} $(CXXFLAGS) -D${PLATFORM} -dynamiclib -prebind
-seg1addr 0x38000000 -compatibility_version 1 -current_version
$(LIB_MAJOR_DOT_VER) -install_name ${LINK_NAME}
LINK = ${CXX} $(CXXFLAGS) ${PLATFORM_COMPILE_OPTIONS}
- export DYLD_LIBRARY_PATH :=
$(XERCESCROOT)/lib:$(ICUROOT)/lib:$(DYLD_LIBRARY_PATH)
+ export DYLD_LIBRARY_PATH :=
$(XERCESCROOT)/lib:$(ICULIB_LOC):$(DYLD_LIBRARY_PATH)
LOC_LIB = ${LOC_LIBNAME}.${LIB_MAJOR_VER}.${LIB_MINOR_VER}$(SHLIBSUFFIX)
LOC_SONAME = ${LOC_LIBNAME}.${LIB_MAJOR_VER}${SHLIBSUFFIX}
MAKE_SHARED_LOC= ${CXX} $(CXXFLAGS) -D${PLATFORM} -dynamiclib -prebind
-seg1addr 0x40000000 -compatibility_version 1 -current_version
$(LIB_MAJOR_DOT_VER) -install_name ${LOC_LIBNAME}${SHLIBSUFFIX}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
