diff options
| author | Daniel Veillard <veillard@src.gnome.org> | 2003-10-28 14:33:17 +0000 |
|---|---|---|
| committer | Daniel Veillard <veillard@src.gnome.org> | 2003-10-28 14:33:17 +0000 |
| commit | db3d2b48e890e6f8ddc009fbd14f8a914edbbc71 (patch) | |
| tree | 4a82888b4c9607929d3b8cf36580f21079777436 /python | |
| parent | d09eebaf565feadf15e8db68eb764015f9923bf1 (diff) | |
| download | libxslt-db3d2b48e890e6f8ddc009fbd14f8a914edbbc71.tar.gz libxslt-db3d2b48e890e6f8ddc009fbd14f8a914edbbc71.tar.bz2 libxslt-db3d2b48e890e6f8ddc009fbd14f8a914edbbc71.zip | |
applied patch from Roumen Petrov for bug #124539 when building outside the
* configure.in python/Makefile.am python/tests/Makefile.am: applied
patch from Roumen Petrov for bug #124539 when building outside the
source directory
* libxslt/xsltutils.c: fixed the way to grab the line number from
the document, use the predefiend libxml2 API which mate it work
with both 2.5.x and 2.6.x
Daniel
Diffstat (limited to 'python')
| -rw-r--r-- | python/Makefile.am | 5 | ||||
| -rw-r--r-- | python/tests/Makefile.am | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/python/Makefile.am b/python/Makefile.am index b6ac5779..b13c4308 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -7,7 +7,8 @@ INCLUDES = \ -I$(PYTHON_INCLUDES) \ $(LIBXML_CFLAGS) \ -I$(top_srcdir)/libxslt \ - -I$(top_srcdir) + -I$(top_srcdir) \ + -I../libexslt DOCS_DIR = $(datadir)/doc/libxslt-python-$(LIBXSLT_VERSION) # libxsltclass.txt is generated @@ -46,7 +47,7 @@ install-data-local: @INSTALL@ -m 0644 libxslt.py $(DESTDIR)$(pythondir) $(mkinstalldirs) $(DESTDIR)$(DOCS_DIR) @(for doc in $(DOCS) ; \ - do @INSTALL@ -m 0644 $$doc $(DESTDIR)$(DOCS_DIR) ; done) + do @INSTALL@ -m 0644 $(srcdir)/$$doc $(DESTDIR)$(DOCS_DIR) ; done) GENERATE = generator.py API_DESC = $(top_srcdir)/doc/libxslt-api.xml $(srcdir)/libxslt-python-api.xml diff --git a/python/tests/Makefile.am b/python/tests/Makefile.am index 936cf6e5..24586881 100644 --- a/python/tests/Makefile.am +++ b/python/tests/Makefile.am @@ -17,8 +17,10 @@ EXTRA_DIST = $(TESTSPY) $(XMLS) $(EXTRAS) if WITH_PYTHON tests: $(TESTSPY) - -@(PYTHONPATH="..:../.libs:$(srcdir)/.." ; export PYTHONPATH; \ - for test in $(TESTSPY) ; do echo "-- $$test" ; $(PYTHON) $(srcdir)/$$test ; done) + -@(PYTHONPATH="`pwd`/..:`pwd`/../.libs:$(srcdir)/.."; \ + if test "x$(LIBXML_SRC)" != "x" ; then PYTHONPATH="$$PYTHONPATH:$(LIBXML_SRC)/python:$(LIBXML_SRC)/python/.libs"; fi; \ + export PYTHONPATH; \ + for test in $(TESTSPY) ; do echo "-- $$test" ; (cd $(srcdir) && $(PYTHON) $$test ); done) else tests: endif @@ -29,5 +31,5 @@ clean: install-data-local: $(mkinstalldirs) $(DESTDIR)$(EXAMPLE_DIR) -(for test in $(TESTSPY) $(XMLS) $(EXTRAS); \ - do @INSTALL@ -m 0644 $$test $(DESTDIR)$(EXAMPLE_DIR) ; done) + do @INSTALL@ -m 0644 $(srcdir)/$$test $(DESTDIR)$(EXAMPLE_DIR) ; done) |