diff --git a/configure.in b/configure.in index 2da94bb..9094a8a 100644 --- a/configure.in +++ b/configure.in @@ -597,9 +597,9 @@ dnl ----------------- WARN_CFLAGS="" dnl USE_WARN="" -AC_MSG_CHECKING(whether to enable compiler warnings) +AC_MSG_CHECKING(whether to abort on compiler warnings) AC_ARG_ENABLE(warn, - [ --disable-warn disable compiler warnings ], + [ --disable-warn don't abort on compiler warnings ], AC_MSG_RESULT(no), AC_MSG_RESULT(yes) dnl USE_WARN="yes" @@ -718,6 +718,8 @@ AC_DEFINE_UNQUOTED(PKGLIBDIR, "$PKGLIBDIR", [Define this to the path containing eval PKGDATADIR="$datadir/$PACKAGE" AC_DEFINE_UNQUOTED(PKGDATADIR, "$PKGDATADIR", [Define this to the path containing the game data (\${prefix}/share/quake2/)]) +eval BINDIR="$bindir" + dnl --------------------------------- dnl Work out what refreshers to build dnl --------------------------------- @@ -861,7 +863,7 @@ fi AC_MSG_RESULT([ Installation directories: - Program: ........... ${prefix}/bin + Program: ........... $BINDIR Audio/Video plugins: $PKGLIBDIR Game data: ......... $PKGDATADIR diff --git a/tools/q2rel b/tools/q2rel index 38a40f0..7b1170d 100755 --- a/tools/q2rel +++ b/tools/q2rel @@ -11,12 +11,13 @@ if [ -z "$1" ]; then echo tag is something like version_0_1 for version 0.1 echo you should have already tagged the repository, as echo this script is going to cvs export from that tag + exit 1 fi # this script is prone to err, tell me what's happening set -x -cd ~/src/quake2 +cd ~/src/quake2/old chmod -R u+w export rm -rf export @@ -25,7 +26,7 @@ mkdir export cd export -cvs -d :ext:gozer:/project/cvs export -r $1 quake2 +cvs -d :ext:zuul:/project/cvs export -r $1 quake2 cd ../cvs @@ -35,10 +36,6 @@ cd ../export/quake2 cp ../../cvs/ChangeLog . -./bootstrap - -./configure - make distcheck VERSION=`echo $1 | sed -e 's/version_//' -e 's/_/./g'` @@ -51,6 +48,12 @@ tar zxf quake2-$VERSION.tar.gz tar jcf quake2-$VERSION.tar.bz2 quake2-$VERSION/ -md5sum quake2-$VERSION.* | tee quake2-$VERSION.release +zip -qr quake2-$VERSION.zip quake2-$VERSION/ + +md5sum quake2-$VERSION.* | grep -v 'release' | tee quake2-$VERSION.release + +scp quake2-$VERSION.* zuul:/home/anonftp/quake2forge rm -r quake2-$VERSION + +pwd