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.

git-svn-id: svn://svn.tartarus.org/sgt/putty@4806 cda61777-01e9-0310-a592-d414129be87e

diff --git a/doc/Makefile b/doc/Makefile
index eb472d9..c60a6d0 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 bde2440..3fcbe10 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 \