Imported Upstream version 1.1.36upstream/1.1.36

6 files changed, 10 insertions, 24 deletions

diff --git a/python/tests/Makefile.am b/python/tests/Makefile.am
index cb186745..c633ce66 100644
--- a/python/tests/Makefile.am
+++ b/python/tests/Makefile.am
@@ -1,23 +1,13 @@
-EXAMPLE_DIR = $(datadir)/doc/libxslt-python-$(LIBXSLT_VERSION)/examples
-
-TESTSPY=	\
+if WITH_PYTHON
+TESTSPY =	\
     basic.py	\
     exslt.py	\
     extelem.py	\
     extfunc.py
 
-XMLS=		\
-    test.xml	\
-    test.xsl
-
-EXTRAS=		\
-    pyxsltproc.py
+exampledir = $(docdir)/python/examples
+dist_example_DATA = test.xml test.xsl pyxsltproc.py $(TESTSPY)
 
-EXTRA_DIST = $(TESTSPY) $(XMLS) $(EXTRAS)
-
-CLEANFILES = *.pyc core
-
-if WITH_PYTHON
 tests: $(TESTSPY)
 	@(PYTHONPATH="`pwd`/..:`pwd`/../.libs:$(srcdir)/.."; \
 	  if test "x$(LIBXML_SRC)" != "x" ; then \
@@ -32,8 +22,4 @@ else
 tests:
 endif
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(EXAMPLE_DIR)
-	-(for test in $(TESTSPY) $(XMLS) $(EXTRAS); \
-	  do $(INSTALL) -m 0644 $(srcdir)/$$test $(DESTDIR)$(EXAMPLE_DIR) ; done)
-
+CLEANFILES = *.pyc core
diff --git a/python/tests/basic.py b/python/tests/basic.py
index 7d9f9867..46355de7 100755
--- a/python/tests/basic.py
+++ b/python/tests/basic.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python -u
+#!/usr/bin/env python
 import sys
 import libxml2
 # Memory debug specific
diff --git a/python/tests/exslt.py b/python/tests/exslt.py
index de5e42bf..b859d187 100755
--- a/python/tests/exslt.py
+++ b/python/tests/exslt.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python -u
+#!/usr/bin/env python
 import sys
 import libxml2
 # Memory debug specific
diff --git a/python/tests/extelem.py b/python/tests/extelem.py
index 0e1bf4bf..2528a399 100644
--- a/python/tests/extelem.py
+++ b/python/tests/extelem.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python -u
+#!/usr/bin/env python
 import sys
 import string
 import libxml2
diff --git a/python/tests/extfunc.py b/python/tests/extfunc.py
index a775494a..0853a55e 100755
--- a/python/tests/extfunc.py
+++ b/python/tests/extfunc.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python -u
+#!/usr/bin/env python
 import sys
 import string
 import libxml2
diff --git a/python/tests/pyxsltproc.py b/python/tests/pyxsltproc.py
index 43108c23..f2469243 100755
--- a/python/tests/pyxsltproc.py
+++ b/python/tests/pyxsltproc.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python -u
+#!/usr/bin/env python
 #
 # The exercise of rewriting xsltproc on top of the python
 # bindings, not complete yet and shows up the things missing