mirror of
https://git.tartarus.org/simon/putty.git
synced 2025-01-10 01:48:00 +00:00
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]
This commit is contained in:
parent
5d32d4af14
commit
7418a9a37f
@ -17,10 +17,12 @@ SVNVERSION=$(shell test -d .svn && svnversion .)
|
|||||||
BADCHARS=$(findstring :,$(SVNVERSION))$(findstring S,$(SVNVERSION))
|
BADCHARS=$(findstring :,$(SVNVERSION))$(findstring S,$(SVNVERSION))
|
||||||
ifeq ($(BADCHARS),)
|
ifeq ($(BADCHARS),)
|
||||||
ifneq ($(SVNVERSION),)
|
ifneq ($(SVNVERSION),)
|
||||||
|
ifneq ($(SVNVERSION),exported)
|
||||||
VERSION=Built from revision $(patsubst M,,$(SVNVERSION))
|
VERSION=Built from revision $(patsubst M,,$(SVNVERSION))
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
endif
|
||||||
# ... and now, we condition our build behaviour on whether or not
|
# ... and now, we condition our build behaviour on whether or not
|
||||||
# VERSION _is_ defined.
|
# VERSION _is_ defined.
|
||||||
ifdef VERSION
|
ifdef VERSION
|
||||||
|
@ -30,7 +30,10 @@ relver=`cat LATEST.VER`
|
|||||||
arcname="putty$arcsuffix"
|
arcname="putty$arcsuffix"
|
||||||
mkdir uxarc
|
mkdir uxarc
|
||||||
mkdir uxarc/$arcname
|
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/{} \;
|
-type d -exec mkdir uxarc/$arcname/{} \;
|
||||||
find . -name uxarc -prune -o \
|
find . -name uxarc -prune -o \
|
||||||
-name CVS -prune -o \
|
-name CVS -prune -o \
|
||||||
|
Loading…
Reference in New Issue
Block a user