trying to fix bug #98517 about building outside the source tree fixed the
* Makefile.am python/Makefile.am python/tests/Makefile.am:
trying to fix bug #98517 about building outside the source tree
* doc/xml.html doc/FAQ.html: fixed the link to libiconv #94585
Daniel
diff --git a/ChangeLog b/ChangeLog
index 2575dbc..9110ca2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Nov 15 12:16:07 CET 2002 Daniel Veillard <daniel@veillard.com>
+
+ * Makefile.am python/Makefile.am python/tests/Makefile.am:
+ trying to fix bug #98517 about building outside the source tree
+ * doc/xml.html doc/FAQ.html: fixed the link to libiconv #94585
+
Thu Nov 14 18:41:55 CEST 2002 Igor Zlatkovic <igor@stud.fh-frankfurt.de>
* include/win32config.h: cleanup
diff --git a/Makefile.am b/Makefile.am
index 6d8b12e..3ec0e13 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -465,25 +465,25 @@
rm result.$$name ; \
fi ; fi ; done)
@echo "Add and del operations on XML Catalogs"
- -@($(CHECKER) $(top_builddir)/xmlcatalog --create --noout result/catalogs/mycatalog; \
+ -@($(CHECKER) $(top_builddir)/xmlcatalog --create --noout $(srcdir)/result/catalogs/mycatalog; \
grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \
- $(CHECKER) $(top_builddir)/xmlcatalog --noout --add public Pubid sysid result/catalogs/mycatalog; \
+ $(CHECKER) $(top_builddir)/xmlcatalog --noout --add public Pubid sysid $(srcdir)/result/catalogs/mycatalog; \
grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \
- $(CHECKER) $(top_builddir)/xmlcatalog --noout --add public Pubid2 sysid2 result/catalogs/mycatalog; \
+ $(CHECKER) $(top_builddir)/xmlcatalog --noout --add public Pubid2 sysid2 $(srcdir)/result/catalogs/mycatalog; \
grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \
- $(CHECKER) $(top_builddir)/xmlcatalog --noout --add public Pubid3 sysid3 result/catalogs/mycatalog; \
+ $(CHECKER) $(top_builddir)/xmlcatalog --noout --add public Pubid3 sysid3 $(srcdir)/result/catalogs/mycatalog; \
grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \
- diff result/catalogs/mycatalog.full result/catalogs/mycatalog; \
+ diff result/catalogs/mycatalog.full $(srcdir)/result/catalogs/mycatalog; \
grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \
- $(CHECKER) $(top_builddir)/xmlcatalog --noout --del sysid result/catalogs/mycatalog; \
+ $(CHECKER) $(top_builddir)/xmlcatalog --noout --del sysid $(srcdir)/result/catalogs/mycatalog; \
grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \
- $(CHECKER) $(top_builddir)/xmlcatalog --noout --del sysid3 result/catalogs/mycatalog; \
+ $(CHECKER) $(top_builddir)/xmlcatalog --noout --del sysid3 $(srcdir)/result/catalogs/mycatalog; \
grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \
- $(CHECKER) $(top_builddir)/xmlcatalog --noout --del sysid2 result/catalogs/mycatalog; \
+ $(CHECKER) $(top_builddir)/xmlcatalog --noout --del sysid2 $(srcdir)/result/catalogs/mycatalog; \
grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \
- diff result/catalogs/mycatalog.empty result/catalogs/mycatalog; \
+ diff result/catalogs/mycatalog.empty $(srcdir)/result/catalogs/mycatalog; \
grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \
- rm -f result/catalogs/mycatalog)
+ rm -f $(srcdir)/result/catalogs/mycatalog)
SVGtests : xmllint$(EXEEXT)
@echo "##"
diff --git a/doc/FAQ.html b/doc/FAQ.html
index 2d808aa..403dde0 100644
--- a/doc/FAQ.html
+++ b/doc/FAQ.html
@@ -197,7 +197,7 @@
<li>iconv: a powerful character encoding conversion library. It is
included by default in recent glibc libraries, so it doesn't need to
be installed specifically on Linux. It now seems a <a href="http://www.opennc.org/onlinepubs/7908799/xsh/iconv.html">part
- of the official UNIX</a> specification. Here is one <a href="http://clisp.cons.org/~haible/packages-libiconv.html">implementation
+ of the official UNIX</a> specification. Here is one <a href="http://www.gnu.org/software/libiconv/">implementation
of the library</a> which source can be found <a href="ftp://ftp.ilog.fr/pub/Users/haible/gnu/">here</a>.</li>
</ul>
</li>
diff --git a/doc/xml.html b/doc/xml.html
index 93f1c35..afb75ea 100644
--- a/doc/xml.html
+++ b/doc/xml.html
@@ -250,7 +250,7 @@
be installed specifically on Linux. It now seems a <a
href="http://www.opennc.org/onlinepubs/7908799/xsh/iconv.html">part
of the official UNIX</a> specification. Here is one <a
- href="http://clisp.cons.org/~haible/packages-libiconv.html">implementation
+ href="http://www.gnu.org/software/libiconv/">implementation
of the library</a> which source can be found <a
href="ftp://ftp.ilog.fr/pub/Users/haible/gnu/">here</a>.</li>
</ul>
diff --git a/python/Makefile.am b/python/Makefile.am
index e6a762f..5b4769a 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -36,8 +36,8 @@
libxml2mod_la_SOURCES = libxml.c types.c libxml2-py.c
libxml2mod_la_LIBADD = $(mylibs)
-libxml2.py: $(srcdir)/libxml.py libxml2class.py
- cat $(srcdir)/libxml.py libxml2class.py > libxml2.py
+libxml2.py: $(srcdir)/libxml.py $(srcdir)/libxml2class.py
+ cat $(srcdir)/libxml.py $(srcdir)/libxml2class.py > libxml2.py
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(libdir)/python${PYTHON_VERSION}/site-packages
diff --git a/python/tests/Makefile.am b/python/tests/Makefile.am
index adb4be3..96cb033 100644
--- a/python/tests/Makefile.am
+++ b/python/tests/Makefile.am
@@ -30,8 +30,8 @@
if WITH_PYTHON
tests: $(PYTESTS)
- -@(PYTHONPATH="..:../.libs" ; export PYTHONPATH; \
- for test in $(PYTESTS) ; do echo "-- $$test" ; $(PYTHON) $$test ; done)
+ -@(PYTHONPATH="..:../.libs:$(srcdir)/.." ; export PYTHONPATH; \
+ for test in $(PYTESTS) ; do echo "-- $$test" ; $(PYTHON) $(srcdir)/$$test ; done)
else
tests:
endif