diff options
Diffstat (limited to 'xstc/Makefile.in')
| -rw-r--r-- | xstc/Makefile.in | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/xstc/Makefile.in b/xstc/Makefile.in index ad49db7..f889d3f 100644 --- a/xstc/Makefile.in +++ b/xstc/Makefile.in @@ -136,6 +136,7 @@ RDL_LIBS = @RDL_LIBS@ READER_TEST = @READER_TEST@ RELDATE = @RELDATE@ RM = @RM@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STATIC_BINARIES = @STATIC_BINARIES@ @@ -164,6 +165,7 @@ THREAD_CFLAGS = @THREAD_CFLAGS@ THREAD_LIBS = @THREAD_LIBS@ U = @U@ VERSION = @VERSION@ +WGET = @WGET@ WIN32_EXTRA_LDFLAGS = @WIN32_EXTRA_LDFLAGS@ WIN32_EXTRA_LIBADD = @WIN32_EXTRA_LIBADD@ WITH_C14N = @WITH_C14N@ @@ -199,6 +201,7 @@ WITH_WRITER = @WITH_WRITER@ WITH_XINCLUDE = @WITH_XINCLUDE@ WITH_XPATH = @WITH_XPATH@ WITH_XPTR = @WITH_XPTR@ +WITH_ZLIB = @WITH_ZLIB@ XINCLUDE_OBJ = @XINCLUDE_OBJ@ XMLLINT = @XMLLINT@ XML_CFLAGS = @XML_CFLAGS@ @@ -450,20 +453,24 @@ $(TESTDIRS) Tests/Metadata/$(NISTTESTDEF_2) Tests/Metadata/$(MSTTESTDEF) Tests/M mkdir Tests ; \ fi) -@(if [ ! -f $(TARBALL_2) ] ; then \ + if [ -f $(srcdir)/$(TARBALL_2) ] ; then \ + $(LN_S) $(srcdir)/$(TARBALL_2) $(TARBALL_2) ; else \ echo "Missing the test suite description (2004-01-14), trying to fetch it" ;\ - if [ -x /usr/bin/wget ] ; then \ - wget $(TARBALLURL_2) ; \ - else echo "Dont' know how to fetch $(TARBALLURL_2)" ; fi ; fi) + if [ -x "$(WGET)" ] ; then \ + $(WGET) $(TARBALLURL_2) ; \ + else echo "Dont' know how to fetch $(TARBALLURL_2)" ; fi ; fi ; fi) -@(if [ -f $(TARBALL_2) ] ; then \ echo -n "extracting test data (NIST)..." ; \ $(TAR) -xzf $(TARBALL_2) '*/Datatypes' '*/Metadata/$(NISTTESTDEF_2)' ; \ echo "done" ; \ fi) -@(if [ ! -f $(TARBALL) ] ; then \ + if [ -f $(srcdir)/$(TARBALL) ] ; then \ + $(LN_S) $(srcdir)/$(TARBALL) $(TARBALL) ; else \ echo "Missing the test suite description (2002-01-16), trying to fetch it" ;\ - if [ -x /usr/bin/wget ] ; then \ - wget $(TARBALLURL) ; \ - else echo "Dont' know how to fetch $(TARBALLURL)" ; fi ; fi) + if [ -x "$(WGET)" ] ; then \ + $(WGET) $(TARBALLURL) ; \ + else echo "Dont' know how to fetch $(TARBALLURL)" ; fi ; fi ; fi) -@(if [ -f $(TARBALL) ] ; then \ echo -n "extracting test data (Sun, Microsoft)..." ; \ $(TAR) -C Tests -xzf $(TARBALL) '*/suntest' '*/msxsdtest' '*/$(MSTESTDEF)' '*/$(SUNTESTDEF)' ; \ @@ -509,21 +516,21 @@ sun-test.py: Tests/Metadata/$(SUNTESTDEF) xstc-to-python.xsl pytests: $(PYSCRIPTS) $(TESTDIRS) -@(if [ -x nist-test.py -a -d $(TESTDIR)/Datatypes ] ; then \ echo "## Running XML Schema tests (NIST)"; \ - PYTHONPATH="../python:../python/.libs:..:../libs:$$PYTHONPATH" ;\ + PYTHONPATH="../python:../python/.libs:..:../.libs:$$PYTHONPATH" ;\ export PYTHONPATH; \ LD_LIBRARY_PATH="$(top_builddir)/.libs:$$LD_LIBRARY_PATH" ; \ export LD_LIBRARY_PATH; \ $(CHECKER) $(PYTHON) nist-test.py -s -b $(srcdir) ; fi) -@(if [ -x sun-test.py -a -d $(TESTDIR)/suntest ] ; then \ echo "## Running Schema tests (Sun)"; \ - PYTHONPATH="../python:../python/.libs:..:../libs:$$PYTHONPATH" ;\ + PYTHONPATH="../python:../python/.libs:..:../.libs:$$PYTHONPATH" ;\ export PYTHONPATH; \ LD_LIBRARY_PATH="$(top_builddir)/.libs:$$LD_LIBRARY_PATH" ; \ export LD_LIBRARY_PATH; \ $(CHECKER) $(PYTHON) sun-test.py -s -b $(srcdir) ; fi) -@(if [ -x ms-test.py -a -d $(TESTDIR)/msxsdtest ] ; then \ echo "## Running Schema tests (Microsoft)"; \ - PYTHONPATH="../python:../python/.libs:..:../libs:$$PYTHONPATH" ;\ + PYTHONPATH="../python:../python/.libs:..:../.libs:$$PYTHONPATH" ;\ export PYTHONPATH; \ LD_LIBRARY_PATH="$(top_builddir)/.libs:$$LD_LIBRARY_PATH" ; \ export LD_LIBRARY_PATH; \ |