mhoyt 2004/03/31 07:35:00
Modified: c/src/xalanc Makefile.in
c/src/xalanc/Utils/XalanMsgLib Makefile.in
Log:
Delete symlinks before (re)creating. Workaround for the semantic
differences of 'ln' on Solaris.
Revision Changes Path
1.29 +14 -8 xml-xalan/c/src/xalanc/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/Makefile.in,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- Makefile.in 26 Feb 2004 23:10:06 -0000 1.28
+++ Makefile.in 31 Mar 2004 15:35:00 -0000 1.29
@@ -228,8 +228,10 @@
ifeq ($(PLATFORM), OS390)
cp -p *.x ${XSL_LIB_DIR}
else
- $(LN) -fs $(LIB) $(XSL_LIB_DIR)/$(LINK_NAME)
- $(LN) -fs $(LIB) $(XSL_LIB_DIR)/$(SO_NAME)
+ rm -f $(XSL_LIB_DIR)/$(LINK_NAME) && \
+ $(LN) -fs $(LIB) $(XSL_LIB_DIR)/$(LINK_NAME)
+ rm -f $(XSL_LIB_DIR)/$(SO_NAME) && \
+ $(LN) -fs $(LIB) $(XSL_LIB_DIR)/$(SO_NAME)
endif ## OS390
endif ## OS390BATCH
@@ -243,8 +245,10 @@
$(MKINSTALLDIRS) $(DESTDIR)/$(libdir)
$(INSTALL_PROGRAM) $(XSL_LIB_DIR)/$(LIB) $(DESTDIR)/$(libdir)
ifneq ($(PLATFORM), OS390)
- $(LN) -fs $(LIB) $(DESTDIR)/$(libdir)/$(LINK_NAME)
- $(LN) -fs $(LIB) $(DESTDIR)/$(libdir)/$(SO_NAME)
+ rm -f $(DESTDIR)/$(libdir)/$(LINK_NAME) && \
+ $(LN) -fs $(LIB) $(DESTDIR)/$(libdir)/$(LINK_NAME)
+ rm -f $(DESTDIR)/$(libdir)/$(SO_NAME) && \
+ $(LN) -fs $(LIB) $(DESTDIR)/$(libdir)/$(SO_NAME)
endif ## OS390
$(MKINSTALLDIRS) $(DESTDIR)/$(includedir)/xalanc
for hdir in $(ALL_HEADERS_DIRS); do \
@@ -257,10 +261,12 @@
$(INSTALL_PROGRAM) $(ICUROOT)/lib/$(ICU_LIBI18N_LIB) \
$(DESTDIR)/$(libdir)
ifneq ($PLATFORM), OS390)
- $(LN) -fs $(ICU_LIBI18N_LIB) \
- $(DESTDIR)/$(libdir)/$(ICU_LIBI18N_LINK_NAME)
- $(LN) -fs $(ICU_LIBI18N_LIB) \
- $(DESTDIR)/$(libdir)/$(ICU_LIBI18N_SO_NAME)
+ rm -f $(DESTIDR)/$(libdir)/$(ICU_LIBI18N_LINK_NAME) && \
+ $(LN) -fs $(ICU_LIBI18N_LIB) \
+ $(DESTDIR)/$(libdir)/$(ICU_LIBI18N_LINK_NAME)
+ rm -f $(DESTDIR)/$(libdir)/$(ICU_LIBI18N_SO_NAME) && \
+ $(LN) -fs $(ICU_LIBI18N_LIB) \
+ $(DESTDIR)/$(libdir)/$(ICU_LIBI18N_SO_NAME)
endif ## OS390
endif
1.5 +11 -4 xml-xalan/c/src/xalanc/Utils/XalanMsgLib/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/Utils/XalanMsgLib/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile.in 26 Feb 2004 22:36:20 -0000 1.4
+++ Makefile.in 31 Mar 2004 15:35:00 -0000 1.5
@@ -33,11 +33,14 @@
$(MESSAGELIB) : ${XSL_OBJ_DIR}/XalanMsgLib.o
$(MAKE_SHARED_LOC) $(PLATFORM_LIBRARIES) $(EXTRA_LINK_OPTIONS)
$(LOC_ALLLIBS) $^ -o $@
- $(LN) -fs $(LOC_LIB) $(XSL_LIB_DIR)/$(LOC_LIBNAME)$(SHLIBSUFFIX)
+ rm -f $(XSL_LIB_DIR)/$(LOC_LIBNAME)$(SHLIBSUFFIX) && \
+ $(LN) -fs $(LOC_LIB) $(XSL_LIB_DIR)/$(LOC_LIBNAME)$(SHLIBSUFFIX)
ifeq ($(PLATFORM), AIX)
$(LN) -fs $(LOC_LIB)
$(XSL_LIB_DIR)/$(LOC_LIBNAME)$(LIB_MAJOR_VER)$(SHLIBSUFFIX)
else
- $(LN) -fs $(LOC_LIB)
$(XSL_LIB_DIR)/$(LOC_LIBNAME)$(SHLIBSUFFIX).$(LIB_MAJOR_VER)
+ rm -f $(XSL_LIB_DIR)/$(LOC_LIBNAME)$(SHLIBSUFFIX).$(LIB_MAJOR_VER) && \
+ $(LN) -fs $(LOC_LIB) \
+ $(XSL_LIB_DIR)/$(LOC_LIBNAME)$(SHLIBSUFFIX).$(LIB_MAJOR_VER)
endif ## AIX
${XSL_OBJ_DIR}/XalanMsgLib.o : $(XALANMSGLIB_SRC)/XalanMsgLib.cpp
$(XALANMSGLIB_SRC)/XalanMsgLib.hpp ${XSL_NLS_DIR}/include/LocalMsgData.hpp
@@ -49,11 +52,15 @@
$(MKINSTALLDIRS) $(DESTDIR)/$(libdir)
$(INSTALL_PROGRAM) $(XSL_LIB_DIR)/$(LOC_LIB) $(DESTDIR)/$(libdir)
ifneq ($(PLATFORM), OS390)
- $(LN) -fs $(LOC_LIB) $(DESTDIR)/$(libdir)/$(LOC_LIBNAME)$(SHLIBSUFFIX)
+ rm -f $(DESTDIR)/$(libdir)/$(LOC_LIBNAME)$(SHLIBSUFFIX) && \
+ $(LN) -fs $(LOC_LIB) \
+ $(DESTDIR)/$(libdir)/$(LOC_LIBNAME)$(SHLIBSUFFIX)
ifeq ($(PLATFORM), AIX)
$(LN) -fs $(LOC_LIB)
$(DESTDIR)/$(libdir)/$(LOC_LIBNAME)$(LIB_MAJOR_VER)$(SHLIBSUFFIX)
else
- $(LN) -fs $(LOC_LIB)
$(DESTDIR)/$(libdir)/$(LOC_LIBNAME)$(SHLIBSUFFIX).$(LIB_MAJOR_VER)
+ rm -f
$(DESTDIR)/$(libdir)/$(LOC_LIBNAME)$(SHLIBSUFFIX).$(LIB_MAJOR_VER) && \
+ $(LN) -fs $(LOC_LIB) \
+
$(DESTDIR)/$(libdir)/$(LOC_LIBNAME)$(SHLIBSUFFIX).$(LIB_MAJOR_VER)
endif ## AIX
endif ## OS390
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
