Fixes to build system

svn path=/; revision=48

diff --git a/trunk/Makefile b/trunk/Makefile
index 17aadedf382de0e71c1dde55d7da249379fa9b34..8e9160cf8f651ce915e40d585a08a82422f69715 100644 (file)
--- a/trunk/Makefile
+++ b/trunk/Makefile
@@ -8,6 +8,7 @@ include makedefs.mak
 
 
 all:
+       echo "YARMOUTH (vb.) To shout at foreigners in the belief that the louder you speak, the better they'll understand you." 
        echo $(PYVERSION)
        echo $(VERSION)
        echo $(docdir)
@@ -23,9 +24,13 @@ dist-gentoolkit-dev:
 
 dist-gentoolkit:
        mkdir -p dist/gentoolkit-$(VERSION)
-       for x in gentool etcat qpkg revdep-rebuild old-scripts ; do \
+       for x in gentool etcat euse qpkg revdep-rebuild old-scripts ; do \
                ( cd src/$$x ; make distdir=dist/gentoolkit-$(VERSION) dist ) \
        done
+       cp {Makefile,AUTHORS,README,TODO,COPYING,NEWS,ChangeLog} dist/gentoolkit-$(VERSION)/
+       cat makedefs.mak | sed "s/^VERSION=.*/VERSION=$(VERSION)/" > dist/gentoolkit-$(VERSION)/makedefs.mak
+       ( cd dist ; tar zcf gentoolkit-$(VERSION).tar.gz gentoolkit-$(VERSION)/ )
+
 install:
        echo "Err0r: Must use either install-gentoolkit or install-gentoolkit-dev"
 
@@ -39,8 +44,8 @@ install-gentoolkit:
 
        install -m 0644 {AUTHORS,ChangeLog,COPYING,NEWS,README,TODO} $(docdir)/
 
-       for x in gentool etcat qpkg euse etc-update revdep-rebuild old-scripts ; do
-               ( cd src/$(x) ; make DESTDIR=$(DESTDIR) install ) 
+       for x in gentool etcat euse qpkg revdep-rebuild old-scripts ; do \
+               ( cd src/$$x ; make DESTDIR=$(DESTDIR) install )  \
        done
 
 install-gentoolkit-dev:

diff --git a/trunk/src/echangelog/Makefile b/trunk/src/echangelog/Makefile
index c22ff6854937864e862fd016676b97c0201fff53..da95f3038359997b6d1917c21e62ac1acb574416 100644 (file)
--- a/trunk/src/echangelog/Makefile
+++ b/trunk/src/echangelog/Makefile
@@ -11,7 +11,7 @@ all:
 
 dist:
        mkdir -p ../../$(distdir)/src/echangelog/
-       cp {AUTHORS,README,TODO,ChangeLog,echangelog,echangelog.1} ../../$(distdir)/src/echangelog/
+       cp {Makefile,AUTHORS,README,TODO,ChangeLog,echangelog,echangelog.1} ../../$(distdir)/src/echangelog/
 
 install:
        install -m 0755 echangelog $(bindir)/

diff --git a/trunk/src/ekeyword/Makefile b/trunk/src/ekeyword/Makefile
index a3f901d8dedbe630372d380c0b978806b3e67e1d..ad793bb7559e320c27305f2a1f2384d104a3d8a7 100644 (file)
--- a/trunk/src/ekeyword/Makefile
+++ b/trunk/src/ekeyword/Makefile
@@ -11,7 +11,7 @@ all:
 
 dist:
        mkdir -p ../../$(distdir)/src/ekeyword
-       cp {AUTHORS,README,TODO,ChangeLog,ekeyword,ekeyword.1} ../../$(distdir)/src/ekeyword/
+       cp {Makefile,AUTHORS,README,TODO,ChangeLog,ekeyword,ekeyword.1} ../../$(distdir)/src/ekeyword/
 
 install:
        install -m 0755 ekeyword $(bindir)/

diff --git a/trunk/src/etc-update/Makefile b/trunk/src/etc-update/Makefile
index 0338744ca90a5fe66859671cfa27b4dba588896f..a9327c73a97b188409cf4d20dd7eef7a91fcee31 100644 (file)
--- a/trunk/src/etc-update/Makefile
+++ b/trunk/src/etc-update/Makefile
@@ -11,7 +11,7 @@ all:
 
 dist:
        mkdir -p ../../$(distdir)/src/etc-update
-       cp {AUTHORS,README,TODO,ChangeLog,etc-update,etc-update.1} ../../$(distdir)/src/etc-update/
+       cp {Makefile,AUTHORS,README,TODO,ChangeLog,etc-update,etc-update.1} ../../$(distdir)/src/etc-update/
 
 install:
        install -m 0755 etc-update $(bindir)/

diff --git a/trunk/src/etcat/Makefile b/trunk/src/etcat/Makefile
index b996880435825d35b8c879310935f9fe3db75dfb..5ba7aeb244051b608a59625190dad2636d22c333 100644 (file)
--- a/trunk/src/etcat/Makefile
+++ b/trunk/src/etcat/Makefile
@@ -4,11 +4,13 @@
 #
 # $Header$
 
+include ../../makedefs.mak
+
 all:
 
 dist:
        mkdir -p ../../$(distdir)/src/etcat
-       cp {AUTHORS,README,TODO,ChangeLog,etcat,etcat.1} ../../$(distdir)/src/etcat
+       cp {Makefile,AUTHORS,README,TODO,ChangeLog,etcat,etcat.1} ../../$(distdir)/src/etcat
 
 install:
        install -m 0755 etcat $(bindir)/

diff --git a/trunk/src/euse/Makefile b/trunk/src/euse/Makefile
new file mode 100644 (file)
index 0000000..cd4f158
--- /dev/null
+++ b/trunk/src/euse/Makefile
@@ -0,0 +1,20 @@
+# Copyright 2004 Karl Trygve Kalleberg <karltk@gentoo.org>
+# Copyright 2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+#
+# $Header$
+
+include ../../makedefs.mak
+
+all:
+       echo "PIMPERNE (n.) One of those rubber nodules found on the underneath side of a lavatory seat."
+
+dist:
+       mkdir -p ../../$(distdir)/src/euse/
+       cp {Makefile,AUTHORS,README,TODO,ChangeLog,euse,euse.1} ../../$(distdir)/src/euse/
+
+install:
+       install -m 0755 euse $(bindir)/
+       install -d $(docdir)/euse
+       install -m 0644 {README,AUTHORS,TODO,ChangeLog} $(docdir)/euse/
+       install -m 0644 euse.1 $(mandir)/

diff --git a/trunk/src/euse/TODO b/trunk/src/euse/TODO
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/trunk/src/gentool/Makefile b/trunk/src/gentool/Makefile
index a25a2b2b517cfb2fb3fafab07f8eb0349898c91f..77798c6c61478b02a8d4298356c86b22d9874b8e 100644 (file)
--- a/trunk/src/gentool/Makefile
+++ b/trunk/src/gentool/Makefile
@@ -11,7 +11,7 @@ all:
 
 dist:
        mkdir -p ../../$(distdir)/src/gentool/
-       cp {AUTHORS,README,TODO,ChangeLog,gentool,gentool.1} ../../$(distdir)/src/gentool/
+       cp {Makefile,AUTHORS,README,TODO,ChangeLog,gentool,gentool.1} ../../$(distdir)/src/gentool/
 
 install:
        install -m 0755 gentool $(bindir)/

diff --git a/trunk/src/gentoolkit/Makefile b/trunk/src/gentoolkit/Makefile
index 5e42a978285add97e9d69feaf73d73cbb7b55aaf..10df62d90e6379a60320508afba3c6f45a057d36 100644 (file)
--- a/trunk/src/gentoolkit/Makefile
+++ b/trunk/src/gentoolkit/Makefile
@@ -9,7 +9,7 @@ all:
 
 dist:
        mkdir -p ../../${distdir}/src/gentoolkit
-       cp {AUTHORS,README,ChangeLog,TODO,gentoolkit.py} ../../${distdir}/src/gentoolkit/
+       cp {Makefile,AUTHORS,README,ChangeLog,TODO,gentoolkit.py} ../../${distdir}/src/gentoolkit/
 
 install:
        install -d $(docdir)/gentoolkit

diff --git a/trunk/src/old-scripts/Makefile b/trunk/src/old-scripts/Makefile
index 99ac0119ea9013a4b4e676508dcfef061c22a5f6..7ea4127fcd549f84453d3a0a596b3220fbca11f1 100644 (file)
--- a/trunk/src/old-scripts/Makefile
+++ b/trunk/src/old-scripts/Makefile
@@ -11,6 +11,7 @@ all:
 
 dist:
        mkdir -p ../../$(distdir)/src/old-scripts/
+       cp Makefile ../../$(distdir)/src/old-scripts/
        cp dep-clean{,.1} ../../$(distdir)/src/old-scripts/
        cp pkg-clean{,.1} ../../$(distdir)/src/old-scripts/
        cp ewhich{,.1} ../../$(distdir)/src/old-scripts/
@@ -19,9 +20,9 @@ dist:
 
 install:
        install -m 0755 dep-clean $(bindir)/
-       install -m 0755 pkg-clean $(bindir)/
+       install -m 0755 pkg-clean $(sbindir)/
        install -m 0755 ewhich $(bindir)/
-       install -m 0755 mkebuild $(bindir)/
+       install -m 0755 mkebuild $(sbindir)/
        install -m 0755 pkg-size $(bindir)/
 
        install -m 0644 dep-clean.1 $(mandir)/

diff --git a/trunk/src/qpkg/Makefile b/trunk/src/qpkg/Makefile
index 692c00653dccdeb3453979fd85ea921847fe85ab..7753c4edbdc8755252657f594596831206943bab 100644 (file)
--- a/trunk/src/qpkg/Makefile
+++ b/trunk/src/qpkg/Makefile
@@ -11,7 +11,7 @@ all:
 
 dist:
        mkdir -p ../../${distdir}/src/qpkg
-       cp {README,AUTHORS,ChangeLog,TODO,qpkg,qpkg.1} ../../${distdir}/src/qpkg/
+       cp {Makefile,README,AUTHORS,ChangeLog,TODO,qpkg,qpkg.1} ../../${distdir}/src/qpkg/
 
 install:
        install -m 0755 qpkg $(bindir)/

diff --git a/trunk/src/revdep-rebuild/Makefile b/trunk/src/revdep-rebuild/Makefile
index 58c9dff3e5b2db5d7ba2560c7fc5f2ebfacbf0d0..1150d0d3d65a640c1955450986f25572618d0e45 100644 (file)
--- a/trunk/src/revdep-rebuild/Makefile
+++ b/trunk/src/revdep-rebuild/Makefile
@@ -11,7 +11,7 @@ all:
 
 dist:
        mkdir -p ../../$(distdir)/src/revdep-rebuild
-       cp {AUTHORS,README,TODO,ChangeLog,revdep-rebuild,revdep-rebuild.1} ../../$(distdir)/src/revdep-rebuild/
+       cp {Makefile,AUTHORS,README,TODO,ChangeLog,revdep-rebuild,revdep-rebuild.1} ../../$(distdir)/src/revdep-rebuild/
 
 install: