From 7a96efc0c9f94e1f9146d1cc7d393b68d6aaf46f Mon Sep 17 00:00:00 2001
From: Daniel Veillard <veillard@src.gnome.org>
Date: Tue, 5 Feb 2002 16:34:33 +0000
Subject: [PATCH] do not install outside of prefix Daniel

* configure.in python/Makefile.am: do not install outside
  of prefix
Daniel
---
 ChangeLog          |  5 +++++
 configure.in       |  2 +-
 python/Makefile.am | 16 ++++++++--------
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1cedd8e0..6f8439c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Feb  5 17:33:30 CET 2002 Daniel Veillard <daniel@veillard.com>
+
+	* configure.in python/Makefile.am: do not install outside
+	  of prefix
+
 Mon Feb  4 15:05:55 CET 2002 Daniel Veillard <daniel@veillard.com>
 
 	* python/TODO python/libxml.c: started adding SAX interfaces
diff --git a/configure.in b/configure.in
index e4955ffd..f5923927 100644
--- a/configure.in
+++ b/configure.in
@@ -223,7 +223,7 @@ if test "$with_python" != "no" ; then
 		if test -r /usr/include/python$PYTHON_VERSION/Python.h
 		then
 		    PYTHON_INCLUDES=/usr/include/python$PYTHON_VERSION
-		    PYTHON_SITE_PACKAGES=/usr/lib/python$PYTHON_VERSION/site-packages
+		    PYTHON_SITE_PACKAGES='$(prefix)/lib/python$PYTHON_VERSION/site-packages'
 		else
 		    echo could not find python$PYTHON_VERSION/Python.h
 		fi
diff --git a/python/Makefile.am b/python/Makefile.am
index 7d02f53f..fb1b6632 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -25,6 +25,14 @@ libxml2.py: $(srcdir)/libxml.py libxml2class.py
 
 _libxml.so: libxml.o libxml2-py.o types.o
 	$(CC) $(LINK_FLAGS) libxml.o libxml2-py.o types.o $(LIBS) -o _libxml.so
+
+install-data-local:
+	$(mkinstalldirs) $(DESTDIR)$(PYTHON_SITE_PACKAGES)
+	-@INSTALL@ -m 0644 libxml2.py $(DESTDIR)$(PYTHON_SITE_PACKAGES)
+	-@INSTALL@ -m 0755 _libxml.so $(DESTDIR)$(PYTHON_SITE_PACKAGES)
+	$(mkinstalldirs) $(DESTDIR)$(DOCS_DIR)
+	-@(for doc in $(DOCS) ; \
+	   do @INSTALL@ -m 0644 $$doc $(DESTDIR)$(DOCS_DIR) ; done)
 else
 all: 
 endif
@@ -54,11 +62,3 @@ tests: all
 clean:
 	rm -f $(GENERATED) *.o _libxml.so *.pyc libxml2.py
 
-install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(PYTHON_SITE_PACKAGES)
-	-@INSTALL@ -m 0644 libxml2.py $(DESTDIR)$(PYTHON_SITE_PACKAGES)
-	-@INSTALL@ -m 0755 _libxml.so $(DESTDIR)$(PYTHON_SITE_PACKAGES)
-	$(mkinstalldirs) $(DESTDIR)$(DOCS_DIR)
-	-@(for doc in $(DOCS) ; \
-	   do @INSTALL@ -m 0644 $$doc $(DESTDIR)$(DOCS_DIR) ; done)
-