dbertoni 2003/11/12 14:31:36
Modified: c/Tests Makefile.in
c/samples Makefile.in
c/src/xalanc Makefile.in
Log:
Patches for bug 13238.
Revision Changes Path
1.3 +3 -7 xml-xalan/c/Tests/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xalan/c/Tests/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.in 6 Nov 2003 08:19:06 -0000 1.2
+++ Makefile.in 12 Nov 2003 22:31:35 -0000 1.3
@@ -66,11 +66,7 @@
# Output directories
-ifneq ("$(shell cd $(XALANCROOT) && pwd)/Tests", "$(shell pwd)")
- OUTDIR := $(shell pwd)
-else
- OUTDIR = ${XALANCROOT}
-endif
+OUTDIR = ..
ifndef XALANCROOT
noxalanroot:
@@ -82,8 +78,8 @@
@echo XERCESCROOT must be defined
endif
-include $(wildcard version.incl $(XALANCROOT)/version.incl)
-include $(wildcard Makefile.incl $(XALANCROOT)/src/xalanc/Makefile.incl)
+include $(XALANCROOT)/version.incl
+include ../Makefile.incl
all: Tests
1.3 +19 -6 xml-xalan/c/samples/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xalan/c/samples/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.in 6 Nov 2003 08:19:14 -0000 1.2
+++ Makefile.in 12 Nov 2003 22:31:35 -0000 1.3
@@ -65,10 +65,10 @@
###################################################################
# Output directories
-ifneq ("$(shell cd $(XALANCROOT) && pwd)/samples", "$(shell pwd)")
- OUTDIR := $(shell pwd)
-else
- OUTDIR = ${XALANCROOT}
+ifeq ($(wildcard ../Makefile.incl),)
+ OUTDIR := .
+else
+ OUTDIR := ..
endif
ifndef XALANCROOT
@@ -97,8 +97,15 @@
XalanTransformerCallback \
XPathWrapper
-include $(wildcard version.incl $(XALANCROOT)/version.incl)
-include $(wildcard Makefile.incl $(XALANCROOT)/src/xalanc/Makefile.incl)
+include $(wildcard $(XALANCROOT)/samples/version.incl \
+ $(XALANCROOT)/version.incl)
+include $(wildcard Makefile.incl ../Makefile.incl)
+
+COMMON_BUILD = version.incl \
+ Makefile.incl.in \
+ config.sub \
+ config.guess \
+ install-sh
all: Samples
@@ -251,6 +258,12 @@
install-extras:
cp -r $(SAMPLES_DIR) $(DESTDIR)/$(prefix)
+ for common_build_file in $(COMMON_BUILD); do \
+ $(INSTALL_PROGRAM) $(XALANCROOT)/$$common_build_file \
+ $(DESTDIR)/$(prefix)/samples; \
+ done
+
+install-package: install install-extras
clean:
rm -rf $(XSL_OBJ_DIR)/*.o
1.19 +9 -43 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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Makefile.in 6 Nov 2003 08:19:24 -0000 1.18
+++ Makefile.in 12 Nov 2003 22:31:35 -0000 1.19
@@ -81,12 +81,9 @@
DEPFILE=depends
-# Output directories
-ifneq ("$(shell cd $(XALANCROOT) && pwd)/src/xalanc", "$(shell pwd)")
- OUTDIR := $(shell pwd)
-else
- OUTDIR = ${XALANCROOT}
-endif
+# Output directory
+OUTDIR := ../..
+
ifndef XALANCROOT
noxalanroot:
@@ -155,14 +152,8 @@
ALL_BINARIES = Xalan
-COMMON_BUILD = version.incl \
- src/xalanc/Makefile.incl.in \
- src/xalanc/config.sub \
- src/xalanc/config.guess \
- src/xalanc/install-sh
-
include $(XALANCROOT)/version.incl
-include Makefile.incl
+include ../../Makefile.incl
# Using ICUBridge
ifdef XALAN_USE_ICU
@@ -267,7 +258,7 @@
endif ## OS390
endif ## OS390BATCH
-install: all
+install: lib XalanExe
$(MKINSTALLDIRS) $(DESTDIR)/$(bindir)
for bin in $(ALL_BINARIES); do \
$(INSTALL_PROGRAM) $(XSL_BIN_DIR)/$$bin \
@@ -282,8 +273,9 @@
$(MKINSTALLDIRS) $(DESTDIR)/$(includedir)/xalanc
for hdir in $(ALL_HEADERS_DIRS); do \
$(MKINSTALLDIRS) $(DESTDIR)/$(includedir)/xalanc/$$hdir; \
- cp $$hdir/*.h* $(DESTIDR)/$(includedir)/xalanc/$$hdir \
- 2> /dev/null; \
+ cp $(XALANCROOT)/src/xalanc/$$hdir/*.h* \
+ $(DESTDIR)/$(includedir)/xalanc/$$hdir \
+ 2> /dev/null; \
done
clean: prepare doClean
@@ -302,30 +294,4 @@
rm -f $(XSL_BIN_DIR)/testXPath
rm -f $(XSL_BIN_DIR)/Xalan
-samples: lib
- $(MAKE) -C $(SAMPLES_DIR) all
-
-tests: lib
- $(MAKE) -C $(TESTS_DIR) all
-
-package: all
- $(MAKE) -C $(SAMPLES_DIR) $<
-
-install-extras:
- $(INSTALL_PROGRAM) $(XALANCROOT)/../KEYS.txt $(DESTDIR)/$(prefix)
- $(INSTALL_PROGRAM) $(XALANCROOT)/License $(DESTDIR)/$(prefix)
-
-install-package-bin: install
- $(MAKE) -C $(SAMPLES_DIR) $<
-
-install-package-extras: install-extras
- $(MAKE) -C $(SAMPLES_DIR) $<
- for common_build_file in $(COMMON_BUILD); do \
- $(INSTALL_PROGRAM) $(XALANCROOT)/$$common_build_file \
- $(DESTDIR)/$(prefix)/samples; \
- done
-
-install-package: install-package-bin install-package-extras
-
-package-clean: clean
- $(MAKE) -C $(SAMPLES_DIR) $<
+install-package: install
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
