From 3cf26c390438285d2b4f139891785bd97fb4d7a4 Mon Sep 17 00:00:00 2001
From: Jamie Wilkinson <jaq@spacepants.org>
Date: Wed, 14 Aug 2002 04:36:14 +0000
Subject: [PATCH] - Removed that evil junk from bootstrap that tried to check  
 for autotools versions -- it's ugly and hard to do right   and isn't worth
 the effort -- from now on I will be   referring people to the first paragraph
 in the README

---
 README    |  6 +++---
 bootstrap | 55 +++++++++++++++++++------------------------------------
 2 files changed, 22 insertions(+), 39 deletions(-)

diff --git a/README b/README
index 68e9a9a..308f45a 100644
--- a/README
+++ b/README
@@ -4,8 +4,8 @@ README for quake2
 Compiling
 ---------
 
-If you are checking this out from CVS, run the bootstrap command first to
-set up configure.  You will need autoconf 2.50, automake 1.6, libtool 1.4,
+If you are checking this out from CVS, run ``./bootstrap'' first to set
+up configure.  You will need autoconf 2.50, automake 1.6, libtool 1.4,
 or greater.  Then follow the instructions in INSTALL.
 
 When specifying locations to arguments like --with-svgalib (i.e. all the
@@ -22,7 +22,7 @@ Installing the game data
 
 The game data is searched for in ./baseq2/ and in 
 ${prefix}/share/quake2/baseq2/ (which by default is 
-/usr/local/share/quake2/baseq2/.  If you get an error that quake2 can't
+/usr/local/share/quake2/baseq2/).  If you get an error that quake2 can't
 find pics/colormap.pcx, it means that it can't find your pak0.pak.  Check
 what prefix you gave to configure, and make sure you have pak0.pak in the
 right directory.
diff --git a/bootstrap b/bootstrap
index fde6f58..c08c80b 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,41 +1,24 @@
 #!/bin/sh
-
 # bootstrap the build when checking out from CVS
 
-# dodgy hack to use gmake if we're on bsd systems
-if [ -x /usr/local/bin/gmake ]; then
-	MAKE=/usr/local/bin/gmake
-else
-	MAKE=make
-fi
-
 if [ "$1" = "clean" ]; then
-	# clean up junk
-	
-	if [ -f Makefile ]; then 
-		$MAKE distclean
-	fi
-	find . -name Makefile.in -print0 | xargs -r0 rm -f
-	rm -f aclocal.m4 install-sh missing mkinstalldirs \
-	      stamp-* tags configure config.* \
-		  compile depcomp ltmain.sh
-	rm -rf autom4te.cache libltdl
-	find . -name '*~' -print0 | xargs -r0 rm -f
-	find . -name '*.rej' -print0 | xargs -r0 rm -f
-	find . -name '*.orig' -print0 | xargs -r0 rm -f
-
-else
-
-    VERSION=`automake --version |head -1| sed 's/automake (GNU automake) //'`
-    MAJOR=`echo $VERSION | cut -f1 -d.`
-    MINOR=`echo $VERSION | cut -f2 -d.`
-    if test "$MAJOR" -ge "1" -a "$MINOR" -ge "6"; then
-	aclocal
-	autoheader
-	libtoolize --copy --ltdl --automake
-	automake --foreign --add-missing --copy
-	autoconf
-    else
-	echo "Need automake version 1.6 or higher"
-    fi
+    # quick hack to remove extra generated files that make distclean
+    # doesn't remove
+    find . -name Makefile.in -print0 | xargs -r0 rm -f
+    rm -f aclocal.m4 install-sh missing mkinstalldirs \
+	stamp-* tags configure config.* \
+	compile depcomp ltmain.sh
+    rm -rf autom4te.cache libltdl
+    find . -name '*~' -print0 | xargs -r0 rm -f
+    find . -name '*.rej' -print0 | xargs -r0 rm -f
+    find . -name '*.orig' -print0 | xargs -r0 rm -f
+    exit
 fi
+
+# no version checking is done here, it's too hard and not worth the effort
+# when one can just read the README
+aclocal && \
+autoheader && \
+libtoolize --copy --ltdl --automake && \
+automake --foreign --add-missing --copy && \
+autoconf