From 3fcc9ce5d22ee4ccca3fafd90ddb825c2078b93e Mon Sep 17 00:00:00 2001
From: karltk <karltk@gentoo.org>
Date: Wed, 7 Jan 2004 14:05:02 +0000
Subject: [PATCH] sys.path fixes

svn path=/; revision=50
---
 trunk/Makefile                |  5 +++--
 trunk/TODO                    |  5 +++++
 trunk/src/equery/Makefile     | 12 ++++++------
 trunk/src/equery/equery       |  6 +++++-
 trunk/src/gentoolkit/Makefile |  2 ++
 5 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/trunk/Makefile b/trunk/Makefile
index ef1074a..2941121 100644
--- a/trunk/Makefile
+++ b/trunk/Makefile
@@ -35,7 +35,8 @@ dist-gentoolkit-dev:
 
 dist-gentoolkit:
 	mkdir -p release/gentoolkit-$(VERSION)$(RELEASE_TAG)
-	for x in equery etcat euse qpkg revdep-rebuild old-scripts ; do \
+	rm -rf release/gentoolkit-$(VERSION)$(RELEASE_TAG)/
+	for x in equery etcat euse qpkg gentoolkit revdep-rebuild old-scripts ; do \
 		( cd src/$$x ; make distdir=release/gentoolkit-$(VERSION)$(RELEASE_TAG) dist ) \
 	done
 	cp {Makefile,AUTHORS,README,TODO,COPYING,NEWS,ChangeLog} release/gentoolkit-$(VERSION)$(RELEASE_TAG)/
@@ -58,7 +59,7 @@ install-gentoolkit:
 
 	install -m 0644 {AUTHORS,ChangeLog,COPYING,NEWS,README,TODO} $(docdir)/
 
-	for x in equery etcat euse qpkg revdep-rebuild old-scripts ; do \
+	for x in equery etcat euse qpkg gentoolkit revdep-rebuild old-scripts ; do \
 		( cd src/$$x ; make DESTDIR=$(DESTDIR) install )  \
 	done
 
diff --git a/trunk/TODO b/trunk/TODO
index 548a3b7..6078bc1 100644
--- a/trunk/TODO
+++ b/trunk/TODO
@@ -25,5 +25,10 @@
 - write a Gentoolkit Guide
 - write efeatures for turning on/off FEATURES in make.conf
 - look at ekeys, ewatch
+- should be removed:
+ - etc-update
+ - epm
+ - useflag
+- add 'clean' target
 
 + check esearch, eupdatedb: separate package for now
diff --git a/trunk/src/equery/Makefile b/trunk/src/equery/Makefile
index 77798c6..e639b5b 100644
--- a/trunk/src/equery/Makefile
+++ b/trunk/src/equery/Makefile
@@ -10,11 +10,11 @@ all:
 	echo "YADDLETHORPE (vb.) (Of offended pooves.) To exit huffily from a boutique."
 
 dist:
-	mkdir -p ../../$(distdir)/src/gentool/
-	cp {Makefile,AUTHORS,README,TODO,ChangeLog,gentool,gentool.1} ../../$(distdir)/src/gentool/
+	mkdir -p ../../$(distdir)/src/equery/
+	cp {Makefile,AUTHORS,README,TODO,ChangeLog,equery,equery.1} ../../$(distdir)/src/equery/
 
 install:
-	install -m 0755 gentool $(bindir)/
-	install -d $(docdir)/gentool
-	install -m 0644 {README,AUTHORS} $(docdir)/gentool/
-	install -m 0644 gentool.1 $(mandir)/
+	install -m 0755 equery $(bindir)/
+	install -d $(docdir)/equery
+	install -m 0644 {README,AUTHORS} $(docdir)/equery/
+	install -m 0644 equery.1 $(mandir)/
diff --git a/trunk/src/equery/equery b/trunk/src/equery/equery
index 40b2e10..f139aee 100755
--- a/trunk/src/equery/equery
+++ b/trunk/src/equery/equery
@@ -17,9 +17,13 @@ import re
 import sys
 import time
 import string
-import gentoolkit
 from output import *
 
+sys.path = ["/usr/lib/portage/pym"] + \
+           ["/usr/lib/gentoolkit/pym"] + \
+           sys.path
+
+import gentoolkit
 
 # Auxiliary functions
 
diff --git a/trunk/src/gentoolkit/Makefile b/trunk/src/gentoolkit/Makefile
index 10df62d..2ebdcb5 100644
--- a/trunk/src/gentoolkit/Makefile
+++ b/trunk/src/gentoolkit/Makefile
@@ -4,6 +4,8 @@
 #
 # $Header$
 
+include ../../makedefs.mak
+
 all:
 	echo "LISTOWEL (n.) The small mat on the bar designed to be more absorbent than the bar, but not as absorbent as your elbows."
 
-- 
2.26.2