turn off the messages from the Makefile; more error checking/messages

3 files changed, 26 insertions, 10 deletions

diff --git a/games-strategy/liquidwar/ChangeLog b/games-strategy/liquidwar/ChangeLog
index 5a88646bdb84..661f5d696672 100644
--- a/games-strategy/liquidwar/ChangeLog
+++ b/games-strategy/liquidwar/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-strategy/liquidwar
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/liquidwar/ChangeLog,v 1.2 2003/09/10 15:51:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/liquidwar/ChangeLog,v 1.3 2003/11/07 01:28:54 mr_bones_ Exp $
+
+  06 Nov 2003; Michael Sterrett <mr_bones_@gentoo.org> liquidwar-5.5.9.ebuild:
+  turn off the messages from the Makefile; more error checking/messages
 
 *liquidwar-5.5.9 (05 Jun 2003)
 
diff --git a/games-strategy/liquidwar/Manifest b/games-strategy/liquidwar/Manifest
index d1f33717daeb..e56c196fd140 100644
--- a/games-strategy/liquidwar/Manifest
+++ b/games-strategy/liquidwar/Manifest
@@ -1,6 +1,6 @@
-MD5 9166b637b5465076af5fd8b6662f00d3 ChangeLog 1414
+MD5 7ef6b3b9b73d2cd9d8ca6198cfc300a8 ChangeLog 1569
 MD5 5c33d189b501bc50a2155a505314d7ef liquidwar-5.5.8.ebuild 721
-MD5 7278cba5d80ba9d0049926e4abd3e95b liquidwar-5.5.9.ebuild 839
+MD5 ef0f0fcc45deb6f8b77300408018c953 liquidwar-5.5.9.ebuild 1351
 MD5 a30c9d4ce8f9629d6d7323eaab258343 metadata.xml 241
 MD5 2dd2c7dde8d981f363fad2bf89ec36db files/digest-liquidwar-5.5.8 68
 MD5 02931807e4cf05dc7adf7d9623aaac31 files/digest-liquidwar-5.5.9 68
diff --git a/games-strategy/liquidwar/liquidwar-5.5.9.ebuild b/games-strategy/liquidwar/liquidwar-5.5.9.ebuild
index 233d31852484..dca51696e988 100644
--- a/games-strategy/liquidwar/liquidwar-5.5.9.ebuild
+++ b/games-strategy/liquidwar/liquidwar-5.5.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/liquidwar/liquidwar-5.5.9.ebuild,v 1.1 2003/09/10 05:27:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/liquidwar/liquidwar-5.5.9.ebuild,v 1.2 2003/11/07 01:28:54 mr_bones_ Exp $
 
 inherit games flag-o-matic
 
@@ -14,21 +14,34 @@ KEYWORDS="x86"
 
 DEPEND=">media-libs/allegro-4.0"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Because we work around some Makefile issues the "helpful" messages
+	# that get printed are wrong for Gentoo.  So we take them out lest
+	# they be confusing.
+	sed -i \
+		-e '/@echo/d' Makefile.in || \
+			die "sed Makefile.in failed"
+}
+
 src_compile() {
 	# Fixes build problem with gcc3 and -march=pentium4
 	replace-flags "-march=pentium4" "-march=pentium3"
 
+	# needs to be econf and not egamesconf.  Otherwise we end up
+	# with too many /games/ all over the place.
 	econf --disable-doc-ps --disable-doc-pdf || die
-	emake || die
+	emake || die "emake failed"
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
-
+	make DESTDIR=${D} install || die "make install failed"
 	cd ${D}/usr/games
-	mkdir bin
-	mv liquidwar liquidwar-server bin/
+	dogamesbin ${D}/usr/games/{liquidwar,liquidwar-server} || \
+		die "dogamesbin failed"
+	rm -f ${D}/usr/games/{liquidwar,liquidwar-server}
 	rm -rf ${D}/usr/bin
-
 	prepgamesdirs
 }