Fixes Makefiles to work with posix shells

svn path=/; revision=150

diff --git a/trunk/ChangeLog b/trunk/ChangeLog
index 517720b001622259921f7c81085d3f32300b3c54..da8a32c3a6bf4b5b40193b9c59384301c1c608cd 100644 (file)
--- a/trunk/ChangeLog
+++ b/trunk/ChangeLog
@@ -1,3 +1,6 @@
+2004-10-10 Karl Trygve Kalleberg <karltk@gentoo.org>
+       * Fixed Makefiles to work with posix-compatible shells
+
 2004-10-06 Marius Mauch <genone@gentoo.org>
        * glsa.py: Convert Unicode strings to ascii before passing them to portage
        * glsa.py: Some formatting fixes for dump()

diff --git a/trunk/Makefile b/trunk/Makefile
index d4c804ac768d58ddf6770e9535ab290fd75fb28f..ef01c4a42d59625853a3a6e905f6a214a25b1a4e 100644 (file)
--- a/trunk/Makefile
+++ b/trunk/Makefile
@@ -25,7 +25,7 @@ dist-gentoolkit-dev:
        for x in ekeyword echangelog ego ebump gensync epkgmove; do \
                ( 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)/
+       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)/" | \
@@ -39,7 +39,7 @@ dist-gentoolkit:
        for x in equery etcat euse qpkg gentoolkit revdep-rebuild old-scripts glsa-check; 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)/
+       cp Makefile AUTHORS README TODO COPYING NEWS ChangeLog release/gentoolkit-$(VERSION)$(RELEASE_TAG)/
        cat makedefs.mak | \
                sed "s/^VERSION=.*/VERSION=$(VERSION)/" | \
                sed "s/^RELEASE_TAG=.*/RELEASE_TAG=$(RELEASE_TAG)/" \
@@ -57,7 +57,7 @@ install-gentoolkit:
        install -d $(sbindir)
        install -d $(mandir)
 
-       install -m 0644 {AUTHORS,ChangeLog,COPYING,NEWS,README,TODO} $(docdir)/
+       install -m 0644 AUTHORS ChangeLog COPYING NEWS README TODO $(docdir)/
 
        for x in equery etcat euse qpkg gentoolkit revdep-rebuild old-scripts glsa-check ; do \
                ( cd src/$$x ; make DESTDIR=$(DESTDIR) install )  \
@@ -71,7 +71,7 @@ install-gentoolkit-dev:
        install -d $(bindir)
        install -d $(mandir)
 
-       install -m 0644 {AUTHORS,ChangeLog,COPYING,NEWS,README,README.Developer,TODO} $(docdir)/
+       install -m 0644 AUTHORS ChangeLog COPYING NEWS README README.Developer TODO $(docdir)/
 
        for x in ekeyword echangelog ego ebump gensync epkgmove ; do \
                ( cd src/$$x ; make DESTDIR=$(DESTDIR) install ) \

diff --git a/trunk/src/ebump/Makefile b/trunk/src/ebump/Makefile
index ec91debf1b5fe0198517ff476182bf095abe0f7b..aa1d34733fad309c177b3366e90022ddab67290e 100644 (file)
--- a/trunk/src/ebump/Makefile
+++ b/trunk/src/ebump/Makefile
@@ -11,10 +11,10 @@ all:
 
 dist: 
        mkdir -p ../../$(distdir)/src/ebump/
-       cp {Makefile,AUTHORS,README,TODO,ChangeLog,ebump,ebump.1} ../../$(distdir)/src/ebump/
+       cp Makefile AUTHORS README TODO ChangeLog ebump ebump.1 ../../$(distdir)/src/ebump/
 
 install: all
        install -m 0755 ebump $(bindir)/
        install -d $(docdir)/ebump
-       install -m 0644 {AUTHORS,README,TODO,ChangeLog} $(docdir)/ebump/
+       install -m 0644 AUTHORS README TODO ChangeLog $(docdir)/ebump/
        install -m 0644 ebump.1 $(mandir)/

diff --git a/trunk/src/echangelog/Makefile b/trunk/src/echangelog/Makefile
index 4475ac356b327661d5f0e3280cbf507ac6115119..19dd85d8fc15f1b8a37142c439cd457c26d9c372 100644 (file)
--- a/trunk/src/echangelog/Makefile
+++ b/trunk/src/echangelog/Makefile
@@ -14,10 +14,10 @@ all: echangelog.1
 
 dist: echangelog.1
        mkdir -p ../../$(distdir)/src/echangelog/
-       cp {Makefile,AUTHORS,README,TODO,ChangeLog,echangelog,echangelog.pod,echangelog.1} ../../$(distdir)/src/echangelog/
+       cp Makefile AUTHORS README TODO ChangeLog echangelog echangelog.pod echangelog.1} ../../$(distdir)/src/echangelog/
 
 install: all
        install -m 0755 echangelog $(bindir)/
        install -d $(docdir)/echangelog 
-       install -m 0644 {AUTHORS,README} $(docdir)/echangelog/
+       install -m 0644 AUTHORS README $(docdir)/echangelog/
        install -m 0644 echangelog.1 $(mandir)/

diff --git a/trunk/src/ego/Makefile b/trunk/src/ego/Makefile
index 53e57ac2f4054588b19853e5e18889c1126d91d9..b27a2cbd3ac4de9d0e64dc7f8b663ed31c5f9534 100644 (file)
--- a/trunk/src/ego/Makefile
+++ b/trunk/src/ego/Makefile
@@ -10,9 +10,9 @@ all:
 
 dist:
        mkdir -p ../../$(distdir)/src/ego/
-       cp {Makefile,AUTHORS,README,TODO,ChangeLog,ego} ../../$(distdir)/src/ego/
+       cp Makefile AUTHORS README TODO ChangeLog ego ../../$(distdir)/src/ego/
 
 install: all
        install -d $(docdir)/ego        
-       install -m 0644 {AUTHORS,README,ego} $(docdir)/ego/
+       install -m 0644 AUTHORS README ego $(docdir)/ego/
 

diff --git a/trunk/src/ekeyword/Makefile b/trunk/src/ekeyword/Makefile
index 708863eaafb13dc8b090001ba446755c1bdda5ca..c3aed8087732e74bd71eef9396665e3baadbf8e6 100644 (file)
--- a/trunk/src/ekeyword/Makefile
+++ b/trunk/src/ekeyword/Makefile
@@ -14,11 +14,11 @@ all: ekeyword.1
 
 dist: ekeyword.1
        mkdir -p ../../$(distdir)/src/ekeyword
-       cp {Makefile,AUTHORS,README,TODO,ChangeLog,ekeyword,ekeyword.1} ../../$(distdir)/src/ekeyword/
+       cp Makefile AUTHORS README TODO ChangeLog ekeyword ekeyword.1 ../../$(distdir)/src/ekeyword/
 
 install: all
        install -m 0755 ekeyword $(bindir)/
        install -d $(docdir)/ekeyword
-       install -m 0644 {AUTHORS,README,TODO,ChangeLog} $(docdir)/ekeyword/
+       install -m 0644 AUTHORS README TODO ChangeLog $(docdir)/ekeyword/
        install -m 0644 ekeyword.1 $(mandir)/
 

diff --git a/trunk/src/epkgmove/Makefile b/trunk/src/epkgmove/Makefile
index e1c861924962c35b1b60a9cfcacbeb447cf3e30c..ce9b9507a9fdd945b69521bce78eca520eefa335 100644 (file)
--- a/trunk/src/epkgmove/Makefile
+++ b/trunk/src/epkgmove/Makefile
@@ -11,10 +11,10 @@ all:
 
 dist: 
        mkdir -p ../../$(distdir)/src/epkgmove/
-       cp {Makefile,AUTHORS,README,TODO,ChangeLog,epkgmove} ../../$(distdir)/src/epkgmove/
+       cp Makefile AUTHORS README TODO ChangeLog epkgmove ../../$(distdir)/src/epkgmove/
 
 install: all
        install -m 0755 epkgmove $(bindir)/
        install -d $(docdir)/epkgmove
-       install -m 0644 {AUTHORS,README,TODO,ChangeLog} $(docdir)/epkgmove/
+       install -m 0644 AUTHORS README TODO ChangeLog $(docdir)/epkgmove/
 #      install -m 0644 epkgmove.1 $(mandir)/

diff --git a/trunk/src/equery/Makefile b/trunk/src/equery/Makefile
index e639b5b71e5a384eb42c270efd359531983b8dfd..cef44736bec2ddaca8a8525dd914b06ecc14589e 100644 (file)
--- a/trunk/src/equery/Makefile
+++ b/trunk/src/equery/Makefile
@@ -11,10 +11,10 @@ all:
 
 dist:
        mkdir -p ../../$(distdir)/src/equery/
-       cp {Makefile,AUTHORS,README,TODO,ChangeLog,equery,equery.1} ../../$(distdir)/src/equery/
+       cp Makefile AUTHORS README TODO ChangeLog equery equery.1 ../../$(distdir)/src/equery/
 
 install:
        install -m 0755 equery $(bindir)/
        install -d $(docdir)/equery
-       install -m 0644 {README,AUTHORS} $(docdir)/equery/
+       install -m 0644 README AUTHORS $(docdir)/equery/
        install -m 0644 equery.1 $(mandir)/

diff --git a/trunk/src/etc-update/Makefile b/trunk/src/etc-update/Makefile
index a9327c73a97b188409cf4d20dd7eef7a91fcee31..95838ad88ca6f39c7c9025c74a0abb62415812ba 100644 (file)
--- a/trunk/src/etc-update/Makefile
+++ b/trunk/src/etc-update/Makefile
@@ -11,10 +11,10 @@ all:
 
 dist:
        mkdir -p ../../$(distdir)/src/etc-update
-       cp {Makefile,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)/
        install -d $(docdir)/etc-update
-       install -m 0644 {AUTHORS,ChangeLog,README} $(docdir)/etc-update/
+       install -m 0644 AUTHORS ChangeLog README $(docdir)/etc-update/
        install -m 0644 etc-update.1 $(mandir)/

diff --git a/trunk/src/etcat/Makefile b/trunk/src/etcat/Makefile
index 5ba7aeb244051b608a59625190dad2636d22c333..0c36b4652d0ba9938c9a3404ac4820a4ab95ce2e 100644 (file)
--- a/trunk/src/etcat/Makefile
+++ b/trunk/src/etcat/Makefile
@@ -10,10 +10,10 @@ all:
 
 dist:
        mkdir -p ../../$(distdir)/src/etcat
-       cp {Makefile,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)/
        install -d $(docdir)/etcat
-       install -m 0644 {README,AUTHORS} $(docdir)/etcat/
+       install -m 0644 README AUTHORS $(docdir)/etcat/
        install -m 0644 etcat.1 $(mandir)/

diff --git a/trunk/src/euse/Makefile b/trunk/src/euse/Makefile
index cd4f15832290b1da761512678b85b3479185a03f..1ccebdb2d3b255b48841a1cfdb55e0fa5c09ae30 100644 (file)
--- a/trunk/src/euse/Makefile
+++ b/trunk/src/euse/Makefile
@@ -11,10 +11,10 @@ all:
 
 dist:
        mkdir -p ../../$(distdir)/src/euse/
-       cp {Makefile,AUTHORS,README,TODO,ChangeLog,euse,euse.1} ../../$(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 README AUTHORS TODO ChangeLog $(docdir)/euse/
        install -m 0644 euse.1 $(mandir)/

diff --git a/trunk/src/gensync/Makefile b/trunk/src/gensync/Makefile
index 6462b1e6491c122b121f8b1362ac9b0aef18ca2f..605ca409cef09f0c92defb1d9044f17c8a2e6e62 100644 (file)
--- a/trunk/src/gensync/Makefile
+++ b/trunk/src/gensync/Makefile
@@ -19,7 +19,7 @@ dist:
 install: all
        install -m 0755 gensync $(bindir)/
        install -d $(docdir)/gensync
-       install -m 0644 {AUTHORS,README,TODO,ChangeLog} $(docdir)/gensync/
+       install -m 0644 AUTHORS README TODO ChangeLog $(docdir)/gensync/
        install -m 0644 gensync.1 $(mandir)/
        install -d $(DESTDIR)/etc/gensync
-       install -m 0644 gensync.conf {bmg-main,bmg-gnome-current}.syncsource $(DESTDIR)/etc/gensync/
+       install -m 0644 gensync.conf bmg-main.syncsource bmg-gnome-current.syncsource $(DESTDIR)/etc/gensync/

diff --git a/trunk/src/gentoolkit/Makefile b/trunk/src/gentoolkit/Makefile
index b9a65f464a08b0b48d0c0c0050b23f77f7ad09b6..9da3da770a2e2f5a657c9be2c1cdb3348a80610b 100644 (file)
--- a/trunk/src/gentoolkit/Makefile
+++ b/trunk/src/gentoolkit/Makefile
@@ -11,13 +11,13 @@ all:
 
 dist:
        mkdir -p ../../${distdir}/src/gentoolkit
-       cp {Makefile,AUTHORS,README,ChangeLog,TODO,gentoolkit.py,pprinter.py,__init__.py} ../../${distdir}/src/gentoolkit/
+       cp Makefile AUTHORS README ChangeLog TODO gentoolkit.py pprinter.py __init__.py ../../${distdir}/src/gentoolkit/
 
 install:
        install -d $(docdir)/gentoolkit
-       install -m 0644 {AUTHORS,README,TODO,ChangeLog} $(docdir)/gentoolkit/
+       install -m 0644 AUTHORS README TODO ChangeLog $(docdir)/gentoolkit/
        install -d $(DESTDIR)/usr/lib/gentoolkit/pym/gentoolkit
        install -m 0644 gentoolkit.py $(DESTDIR)/usr/lib/gentoolkit/pym/gentoolkit/
        install -m 0644 pprinter.py $(DESTDIR)/usr/lib/gentoolkit/pym/gentoolkit/
        install -m 0644 __init__.py $(DESTDIR)/usr/lib/gentoolkit/pym/gentoolkit/
-       
\ No newline at end of file
+       

diff --git a/trunk/src/gentoolkit/pprinter.py b/trunk/src/gentoolkit/pprinter.py
index b9c6a88b2760821aad650bae69fb890dade1854b..f4ee420f32bd92b5152990a54803e673f1ce7b1b 100644 (file)
--- a/trunk/src/gentoolkit/pprinter.py
+++ b/trunk/src/gentoolkit/pprinter.py
@@ -23,7 +23,7 @@ def print_warn(s):
     sys.stderr.write("!!! " + s + "\n")
     
 def die(err, s):
-    error(s)
+    print_error(s)
     sys.exit(-err)
 
 # Colour settings