1
0
mirror of https://gitlab.gnome.org/GNOME/libxslt synced 2025-07-28 04:41:59 +03:00

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
This commit is contained in:
Daniel Veillard
2003-10-28 14:33:17 +00:00
parent d09eebaf56
commit db3d2b48e8
6 changed files with 25 additions and 21 deletions

View File

@ -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

View File

@ -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)