dbertoni 2003/12/03 09:30:36
Modified: c/src/xalanc/Utils Makefile.in
Log:
Fixed bug where wrong macro was used for soname and symlinks.
Revision Changes Path
1.2 +7 -7 xml-xalan/c/src/xalanc/Utils/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/Utils/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.in 2 Dec 2003 19:58:52 -0000 1.1
+++ Makefile.in 3 Dec 2003 17:30:36 -0000 1.2
@@ -69,7 +69,7 @@
LOC_LIB = ${LOC_LIBNAME}$(SHLIBSUFFIX).${LIB_MAJOR_VER}.${LIB_MINOR_VER}
-LOC_SONAME = ${LOC_LIBNAME}${SHLIBSUFFIX}.${LIBMAJORVER}
+LOC_SONAME = ${LOC_LIBNAME}${SHLIBSUFFIX}.${LIB_MAJOR_VER}
MESSAGELIB = ${XSL_LIB_DIR}/${LOC_LIB}
@@ -147,9 +147,9 @@
MAKE_SHARED_LOC=$(MAKE_SHARED)
-LOC_LIB = ${LOC_LIBNAME}${LIBMAJORVER}.${LIBMINORVER}${SHLIBSUFFIX}
+LOC_LIB = ${LOC_LIBNAME}${LIB_MAJOR_VER}.${LIBMINORVER}${SHLIBSUFFIX}
-LOC_LIBKEYNAME=${LOC_PROJECT_NAME}${LIBMAJORVER}
+LOC_LIBKEYNAME=${LOC_PROJECT_NAME}${LIB_MAJOR_VER}
endif
@@ -205,9 +205,9 @@
$(MAKE_SHARED_LOC) $(PLATFORM_LIBRARIES) $(EXTRA_LINK_OPTIONS)
$(LOC_ALLLIBS) $^ -o $@
$(LN) -fs $(LOC_LIB) $(XSL_LIB_DIR)/$(LOC_LIBNAME)$(SHLIBSUFFIX)
ifeq ($(PLATFORM), AIX)
- $(LN) -fs $(LOC_LIB)
$(XSL_LIB_DIR)/$(LOC_LIBNAME)$(LIBMAJORVER)$(SHLIBSUFFIX)
+ $(LN) -fs $(LOC_LIB)
$(XSL_LIB_DIR)/$(LOC_LIBNAME)$(LIB_MAJOR_VER)$(SHLIBSUFFIX)
else
- $(LN) -fs $(LOC_LIB)
$(XSL_LIB_DIR)/$(LOC_LIBNAME)$(SHLIBSUFFIX).$(LIBMAJORVER)
+ $(LN) -fs $(LOC_LIB)
$(XSL_LIB_DIR)/$(LOC_LIBNAME)$(SHLIBSUFFIX).$(LIB_MAJOR_VER)
endif ## AIX
$(XALANMSGLIB_SRC)/LocalMsgData.hpp : $(XSL_BIN_DIR)/MsgCreator
$(XSL_NLS_DIR)/$(LOCAL)/$(MSGFILENAME)$(LOCAL)$(XIFFEXT)
@@ -242,9 +242,9 @@
$(PKGDATA) --name $(LOC_PROJECT_NAME) -T . -v -O
$(ICUROOT)/lib/icu/Makefile.inc --mode dll -d $(XSL_LIB_DIR) res-file-list.txt
-M "prefix=$(ICUROOT) TARGET=$(LOC_LIB)"
$(LN) -fs $(LOC_LIB) $(XSL_LIB_DIR)/$(LOC_LIBNAME)$(SHLIBSUFFIX)
ifeq ($(PLATFORM), AIX)
- $(LN) -fs $(LOC_LIB)
$(XSL_LIB_DIR)/$(LOC_LIBNAME)$(LIBMAJORVER)$(SHLIBSUFFIX)
+ $(LN) -fs $(LOC_LIB)
$(XSL_LIB_DIR)/$(LOC_LIBNAME)$(LIB_MAJOR_VER)$(SHLIBSUFFIX)
else
- $(LN) -fs $(LOC_LIB)
$(XSL_LIB_DIR)/$(LOC_LIBNAME)$(SHLIBSUFFIX).$(LIBMAJORVER)
+ $(LN) -fs $(LOC_LIB)
$(XSL_LIB_DIR)/$(LOC_LIBNAME)$(SHLIBSUFFIX).$(LIB_MAJOR_VER)
endif ## AIX
$(INCLUDE_DIR)/LocalMsgIndex.hpp : $(XSL_NLS_DIR)/$(LOCAL)/$(LOCAL).txt
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
