From: simon <simon@cda61777-01e9-0310-a592-d414129be87e>
Date: Wed, 17 Nov 2004 18:27:04 +0000 (+0000)
Subject: mkunxarc.sh was still including (mostly empty) .svn directories, and
X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/commitdiff_plain/2ce79856e6d3257eba87d95b6c08973e604c4db1?hp=39a938f7a5e16b4be9bee493251238710fbff396

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 eb472d98..c60a6d07 100644
--- 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 bde24405..3fcbe107 100755
--- 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 \