From e45c1b2873c629f478a3efa085aa252281bcc9b3 Mon Sep 17 00:00:00 2001
From: karltk <karltk@gentoo.org>
Date: Sat, 9 Oct 2004 23:49:46 +0000
Subject: [PATCH] Fixes Makefiles to work with posix shells

svn path=/; revision=150
---
 trunk/ChangeLog                  | 3 +++
 trunk/Makefile                   | 8 ++++----
 trunk/src/ebump/Makefile         | 4 ++--
 trunk/src/echangelog/Makefile    | 4 ++--
 trunk/src/ego/Makefile           | 4 ++--
 trunk/src/ekeyword/Makefile      | 4 ++--
 trunk/src/epkgmove/Makefile      | 4 ++--
 trunk/src/equery/Makefile        | 4 ++--
 trunk/src/etc-update/Makefile    | 4 ++--
 trunk/src/etcat/Makefile         | 4 ++--
 trunk/src/euse/Makefile          | 4 ++--
 trunk/src/gensync/Makefile       | 4 ++--
 trunk/src/gentoolkit/Makefile    | 6 +++---
 trunk/src/gentoolkit/pprinter.py | 2 +-
 14 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/trunk/ChangeLog b/trunk/ChangeLog
index 517720b..da8a32c 100644
--- 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 d4c804a..ef01c4a 100644
--- 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 ec91deb..aa1d347 100644
--- 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 4475ac3..19dd85d 100644
--- 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 53e57ac..b27a2cb 100644
--- 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 708863e..c3aed80 100644
--- 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 e1c8619..ce9b950 100644
--- 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 e639b5b..cef4473 100644
--- 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 a9327c7..95838ad 100644
--- 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 5ba7aeb..0c36b46 100644
--- 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 cd4f158..1ccebdb 100644
--- 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 6462b1e..605ca40 100644
--- 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 b9a65f4..9da3da7 100644
--- 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 b9c6a88..f4ee420 100644
--- 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
-- 
2.26.2