improve Makefile for release

[r20910]

diff --git a/Makefile b/Makefile
index 52f5da7..34b231f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -74,8 +74,10 @@ config.h:
 %.h:
        @true
 
+REVISION ?= $(shell svnversion -n .)
+
 .depend: config.h $(SOURCES)
-       @echo "#define cparser_REVISION \"`svnversion -n .`\"" > .revision.h
+       @echo "#define cparser_REVISION \"$(REVISION)\"" > .revision.h
        $(Q)if diff -Nq .revision.h revision.h > /dev/null; then \
              rm .revision.h;                                    \
            else                                                 \

diff --git a/make_release.sh b/make_release.sh
index c1e1d47..2bc0de3 100755 (executable)
--- a/make_release.sh
+++ b/make_release.sh
@@ -7,7 +7,9 @@ RELEASEDIR="cparser-$VERSION"
 FULLRELEASEDIR="$WORKDIR/$RELEASEDIR"
 RELEASEFILE="cparser-$VERSION.tar.bz2"
 SOURCEDIRS="adt driver builtins ."
-ADDFILES="README TODO NEWS AUTHOR COPYING Makefile"
+ADDFILES="README TODO NEWS AUTHOR COPYING"
+
+rm -rf "$FULLRELEASEDIR"
 
 echo "Preparing $FULLRELEASEDIR"
 mkdir -p "$WORKDIR"
@@ -21,6 +23,8 @@ for dir in $SOURCEDIRS; do
        cp -p "$dir/"*.[ch] "$FULLRELEASEDIR/$dir"
 done
 cp $ADDFILES "$FULLRELEASEDIR"
+echo "REVISION = \"$VERSION\"" > "$FULLRELEASEDIR/Makefile"
+cat Makefile >> "$FULLRELEASEDIR/Makefile"
 
 echo "creating $RELEASEFILE"
 pushd "$WORKDIR"