svn commit: r719336 - in /xalan/c/trunk/src/xalanc: Makefile.in Utils/XalanMsgLib/Makefile.in
[email protected] Thu, 20 Nov 2008 19:38:30 -0000
| Newsgroups | gmane.text.xml.xalan.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: dbertoni
Date: Thu Nov 20 11:38:30 2008
New Revision: 719336
URL: http://svn.apache.org/viewvc?rev=719336&view=rev
Log:
Reverted previous change for Mingw, since it breaks other platforms.
Modified:
xalan/c/trunk/src/xalanc/Makefile.in
xalan/c/trunk/src/xalanc/Utils/XalanMsgLib/Makefile.in
Modified: xalan/c/trunk/src/xalanc/Makefile.in
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Makefile.in?rev=719336&r1=719335&r2=719336&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Makefile.in (original)
+++ xalan/c/trunk/src/xalanc/Makefile.in Thu Nov 20 11:38:30 2008
@@ -237,9 +237,9 @@
mv *.x ${XSL_LIB_DIR}
else
rm -f $(XSL_LIB_DIR)/$(LINK_NAME) && \
- $(LN) -fs $(XSL_LIB_DIR)/$(LIB) $(XSL_LIB_DIR)/$(LINK_NAME)
+ $(LN) -fs $(LIB) $(XSL_LIB_DIR)/$(LINK_NAME)
rm -f $(XSL_LIB_DIR)/$(SO_NAME) && \
- $(LN) -fs $(XSL_LIB_DIR)/$(LIB) $(XSL_LIB_DIR)/$(SO_NAME)
+ $(LN) -fs $(LIB) $(XSL_LIB_DIR)/$(SO_NAME)
endif ## OS390
endif ## OS390BATCH
@@ -254,9 +254,9 @@
$(INSTALL_PROGRAM) $(XSL_LIB_DIR)/$(LIB) $(DESTDIR)/$(libdir)
ifneq ($(PLATFORM), OS390)
rm -f $(DESTDIR)/$(libdir)/$(LINK_NAME) && \
- $(LN) -fs $(XSL_LIB_DIR)/$(LIB) $(DESTDIR)/$(libdir)/$(LINK_NAME)
+ $(LN) -fs $(LIB) $(DESTDIR)/$(libdir)/$(LINK_NAME)
rm -f $(DESTDIR)/$(libdir)/$(SO_NAME) && \
- $(LN) -fs $(XSL_LIB_DIR)/$(LIB) $(DESTDIR)/$(libdir)/$(SO_NAME)
+ $(LN) -fs $(LIB) $(DESTDIR)/$(libdir)/$(SO_NAME)
endif ## OS390
$(MKINSTALLDIRS) $(DESTDIR)/$(includedir)/xalanc
for hdir in $(ALL_HEADERS_DIRS); do \
Modified: xalan/c/trunk/src/xalanc/Utils/XalanMsgLib/Makefile.in
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Utils/XalanMsgLib/Makefile.in?rev=719336&r1=719335&r2=719336&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Utils/XalanMsgLib/Makefile.in (original)
+++ xalan/c/trunk/src/xalanc/Utils/XalanMsgLib/Makefile.in Thu Nov 20 11:38:30 2008
@@ -35,12 +35,12 @@
$(MAKE_SHARED_LOC) $(EXTRA_LOC_LINK_OPTIONS) $^ -o $@
ifneq ($(PLATFORM), OS390)
rm -f $(XSL_LIB_DIR)/$(LOC_LIBNAME)$(SHLIBSUFFIX) && \
- $(LN) -fs $(XSL_LIB_DIR)/$(LOC_LIB) $(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
rm -f $(XSL_LIB_DIR)/$(LOC_LIBNAME)$(SHLIBSUFFIX).$(LIB_MAJOR_VER) && \
- $(LN) -fs $(XSL_LIB_DIR)/$(LOC_LIB) \
+ $(LN) -fs $(LOC_LIB) \
$(XSL_LIB_DIR)/$(LOC_LIBNAME)$(SHLIBSUFFIX).$(LIB_MAJOR_VER)
endif ## AIX