mkunxarc.sh was still including (mostly empty) .svn directories, and

that in turn was confusing the new doc/Makefile mechanism. Fixed the
former, and also put an additional safeguard in the latter in a
belt-and-braces sort of fashion.

[originally from svn r4806]

diff --git a/doc/Makefile b/doc/Makefile
index eb472d988a017ed1c16ac995c880bd670c15f772..c60a6d07f854320a21abba570c7d9776c269bf25 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -17,10 +17,12 @@ SVNVERSION=$(shell test -d .svn && svnversion .)
 BADCHARS=$(findstring :,$(SVNVERSION))$(findstring S,$(SVNVERSION))
 ifeq ($(BADCHARS),)
 ifneq ($(SVNVERSION),)
+ifneq ($(SVNVERSION),exported)
 VERSION=Built from revision $(patsubst M,,$(SVNVERSION))
 endif
 endif
 endif
+endif
 # ... and now, we condition our build behaviour on whether or not
 # VERSION _is_ defined.
 ifdef VERSION

diff --git a/mkunxarc.sh b/mkunxarc.sh
index bde24405e97b0e0a7238db1a057db3cb746d318e..3fcbe107928b6fbee616a36a4b18dd7939baf678 100755 (executable)
--- a/mkunxarc.sh
+++ b/mkunxarc.sh
@@ -30,7 +30,10 @@ relver=`cat LATEST.VER`
 arcname="putty$arcsuffix"
 mkdir uxarc
 mkdir uxarc/$arcname
-find . -name uxarc -prune -o -name . -o \
+find . -name uxarc -prune -o \
+       -name CVS -prune -o \
+       -name .svn -prune -o \
+       -name . -o \
        -type d -exec mkdir uxarc/$arcname/{} \;
 find . -name uxarc -prune -o \
        -name CVS -prune -o \