Index: makedefs.mak
===================================================================
--- makedefs.mak	(revision 474)
+++ makedefs.mak	(working copy)
@@ -10,9 +10,10 @@
 RELEASE_TAG=
 # python-config is not installed on all arches Bug #113386
 #PYVERSION="`python-config | sed 's/-l//' | sed 's/ -lm.*//'`"
-PYVERSION="`LC_COLLATE=C; python -V 2>&1 | tr '[:upper:]' '[:lower:]' | sed -e 's/ //g;s/\([0-9]\.[0-9]\)\.[0-9]/\1/'`"
+PYVERSION="`LC_COLLATE=C python -V 2>&1 |	tr '[:upper:]' '[:lower:]' | sed -e 's/ //g;s/\([0-9]\.[0-9]\)\.[0-9]/\1/'`"
 DESTDIR=
 
+pydir=$(DESTDIR)/usr/lib/$(PYVERSION)/site-packages
 docdir=$(DESTDIR)/usr/share/doc/gentoolkit-$(VERSION)$(RELEASE_TAG)
 bindir=$(DESTDIR)/usr/bin
 sbindir=$(DESTDIR)/usr/sbin
Index: src/gentoolkit/Makefile
===================================================================
--- src/gentoolkit/Makefile	(revision 474)
+++ src/gentoolkit/Makefile	(working copy)
@@ -16,7 +16,7 @@
 install:
 	install -d $(docdir)/gentoolkit
 	install -m 0644 AUTHORS README TODO $(docdir)/gentoolkit/
-	install -d $(DESTDIR)/usr/lib/gentoolkit/pym/gentoolkit
-	install -m 0644 package.py pprinter.py helpers.py errors.py $(DESTDIR)/usr/lib/gentoolkit/pym/gentoolkit/
-	install -m 0644 __init__.py $(DESTDIR)/usr/lib/gentoolkit/pym/gentoolkit/
+	install -d $(pydir)/gentoolkit
+	install -m 0644 package.py pprinter.py helpers.py errors.py $(pydir)/gentoolkit/
+	install -m 0644 __init__.py $(pydir)/gentoolkit/
 	
Index: src/etcat/etcat
===================================================================
--- src/etcat/etcat	(revision 474)
+++ src/etcat/etcat	(working copy)
@@ -87,9 +87,8 @@
 import getopt
 import glob
 
-# portage and gentoolkit need special path modifications
+# portage needs a special path modification
 sys.path.insert(0, "/usr/lib/portage/pym")
-sys.path.insert(0, "/usr/lib/gentoolkit/pym")
 
 import gentoolkit
 from stat import *
Index: src/glsa-check/glsa-check
===================================================================
--- src/glsa-check/glsa-check	(revision 474)
+++ src/glsa-check/glsa-check	(working copy)
@@ -5,7 +5,6 @@
 
 import os
 import sys
-sys.path.insert(0, "/usr/lib/gentoolkit/pym")
 try:
 	import portage
 except ImportError:
Index: src/glsa-check/Makefile
===================================================================
--- src/glsa-check/Makefile	(revision 474)
+++ src/glsa-check/Makefile	(working copy)
@@ -14,7 +14,7 @@
 	cp Makefile glsa.py glsa-check glsa-check.1 ../../$(distdir)/src/glsa-check/
 
 install:
-	install -d $(DESTDIR)/usr/lib/gentoolkit/pym/
+	install -d $(pydir)/
 	install -m 0755 glsa-check $(bindir)/
-	install -m 0644 glsa.py $(DESTDIR)/usr/lib/gentoolkit/pym/
+	install -m 0644 glsa.py $(pydir)/
 	install -m 0644 glsa-check.1 $(mandir)/
Index: src/revdep-rebuild/find_pkgs.py
===================================================================
--- src/revdep-rebuild/find_pkgs.py	(revision 474)
+++ src/revdep-rebuild/find_pkgs.py	(working copy)
@@ -6,7 +6,6 @@
 
 import sys
 
-sys.path.insert(0, "/usr/lib/gentoolkit/pym")
 import gentoolkit
 
 for pkgname in sys.argv[1:]:
Index: src/equery/equery
===================================================================
--- src/equery/equery	(revision 474)
+++ src/equery/equery	(working copy)
@@ -20,7 +20,6 @@
 
 # portage (output module) and gentoolkit need special path modifications
 sys.path.insert(0, "/usr/lib/portage/pym")
-sys.path.insert(0, "/usr/lib/gentoolkit/pym")
 
 import gentoolkit
 try:
Index: Makefile
===================================================================
--- Makefile	(revision 474)
+++ Makefile	(working copy)
@@ -12,6 +12,7 @@
 	echo $(PYVERSION)
 	echo $(VERSION)
 	echo $(docdir)
+	echo $(pydir)
 	echo $(bindir)
 	echo $(sbindir)
 	echo $(mandir)
@@ -29,10 +30,10 @@
 		( cd src/$$x ; $(MAKE) distdir=release/gentoolkit-dev-$(VERSION)$(RELEASE_TAG) dist ) \
 	done
 	cp Makefile AUTHORS README README.Developer TODO COPYING NEWS ChangeLog release/gentoolkit-dev-$(VERSION)$(RELEASE_TAG)/
-	cat makedefs.mak | \
-		sed "s/^VERSION=.*/VERSION=$(VERSION)/" | \
-		sed "s/^RELEASE_TAG=.*/RELEASE_TAG=$(RELEASE_TAG)/" | \
-		sed "s:^docdir=.*:docdir=\$$(DESTDIR)/usr/share/doc/gentoolkit-dev-\$$(VERSION)\$$(RELEASE_TAG):" \
+	sed makedefs.mak \
+		  -e "s/^VERSION=.*/VERSION=$(VERSION)/" \
+		  -e "s/^RELEASE_TAG=.*/RELEASE_TAG=$(RELEASE_TAG)/" \
+		  -e "s:^docdir=.*:docdir=\$$(DESTDIR)/usr/share/doc/gentoolkit-dev-\$$(VERSION)\$$(RELEASE_TAG):" \
 		> release/gentoolkit-dev-$(VERSION)$(RELEASE_TAG)/makedefs.mak
 	( cd release ; tar zcf gentoolkit-dev-$(VERSION)$(RELEASE_TAG).tar.gz gentoolkit-dev-$(VERSION)$(RELEASE_TAG)/ )
 
@@ -44,9 +45,9 @@
 	done
 	cp Makefile AUTHORS README TODO COPYING NEWS ChangeLog release/gentoolkit-$(VERSION)$(RELEASE_TAG)/
 	cp src/99gentoolkit-env release/gentoolkit-$(VERSION)$(RELEASE_TAG)/src/
-	cat makedefs.mak | \
-		sed "s/^VERSION=.*/VERSION=$(VERSION)/" | \
-		sed "s/^RELEASE_TAG=.*/RELEASE_TAG=$(RELEASE_TAG)/" \
+	sed makedefs.mak \
+		  -e "s/^VERSION=.*/VERSION=$(VERSION)/" \
+		  -e "s/^RELEASE_TAG=.*/RELEASE_TAG=$(RELEASE_TAG)/" \
 		> release/gentoolkit-$(VERSION)$(RELEASE_TAG)/makedefs.mak
 	( cd release ; tar zcf gentoolkit-$(VERSION)$(RELEASE_TAG).tar.gz gentoolkit-$(VERSION)$(RELEASE_TAG)/ )
 
@@ -57,6 +58,7 @@
 install-gentoolkit:
 
 	install -d $(docdir)
+	install -d $(pydir)
 	install -d $(bindir)
 	install -d $(sbindir)
 	install -d $(mandir)