- 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
This commit is contained in:
Jamie Wilkinson 2002-08-14 04:36:14 +00:00
parent 91f39e0e8a
commit 3cf26c3904
2 changed files with 22 additions and 39 deletions

6
README
View file

@ -4,8 +4,8 @@ README for quake2
Compiling Compiling
--------- ---------
If you are checking this out from CVS, run the bootstrap command first to If you are checking this out from CVS, run ``./bootstrap'' first to set
set up configure. You will need autoconf 2.50, automake 1.6, libtool 1.4, up configure. You will need autoconf 2.50, automake 1.6, libtool 1.4,
or greater. Then follow the instructions in INSTALL. or greater. Then follow the instructions in INSTALL.
When specifying locations to arguments like --with-svgalib (i.e. all the 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 The game data is searched for in ./baseq2/ and in
${prefix}/share/quake2/baseq2/ (which by default is ${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 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 what prefix you gave to configure, and make sure you have pak0.pak in the
right directory. right directory.

View file

@ -1,20 +1,9 @@
#!/bin/sh #!/bin/sh
# bootstrap the build when checking out from CVS # 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 if [ "$1" = "clean" ]; then
# clean up junk # quick hack to remove extra generated files that make distclean
# doesn't remove
if [ -f Makefile ]; then
$MAKE distclean
fi
find . -name Makefile.in -print0 | xargs -r0 rm -f find . -name Makefile.in -print0 | xargs -r0 rm -f
rm -f aclocal.m4 install-sh missing mkinstalldirs \ rm -f aclocal.m4 install-sh missing mkinstalldirs \
stamp-* tags configure config.* \ stamp-* tags configure config.* \
@ -23,19 +12,13 @@ if [ "$1" = "clean" ]; then
find . -name '*~' -print0 | xargs -r0 rm -f find . -name '*~' -print0 | xargs -r0 rm -f
find . -name '*.rej' -print0 | xargs -r0 rm -f find . -name '*.rej' -print0 | xargs -r0 rm -f
find . -name '*.orig' -print0 | xargs -r0 rm -f find . -name '*.orig' -print0 | xargs -r0 rm -f
exit
fi
else # no version checking is done here, it's too hard and not worth the effort
# when one can just read the README
VERSION=`automake --version |head -1| sed 's/automake (GNU automake) //'` aclocal && \
MAJOR=`echo $VERSION | cut -f1 -d.` autoheader && \
MINOR=`echo $VERSION | cut -f2 -d.` libtoolize --copy --ltdl --automake && \
if test "$MAJOR" -ge "1" -a "$MINOR" -ge "6"; then automake --foreign --add-missing --copy && \
aclocal
autoheader
libtoolize --copy --ltdl --automake
automake --foreign --add-missing --copy
autoconf autoconf
else
echo "Need automake version 1.6 or higher"
fi
fi