~mdw
/
sgt
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Mention `-cleanup' caveats on multi-user systems.
[sgt/putty]
/
doc
/
Makefile
diff --git
a/doc/Makefile
b/doc/Makefile
index
eb472d9
..
9ac45e8
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),)
BADCHARS=$(findstring :,$(SVNVERSION))$(findstring S,$(SVNVERSION))
ifeq ($(BADCHARS),)
ifneq ($(SVNVERSION),)
+ifneq ($(SVNVERSION),exported)
VERSION=Built from revision $(patsubst M,,$(SVNVERSION))
endif
endif
endif
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
# ... and now, we condition our build behaviour on whether or not
# VERSION _is_ defined.
ifdef VERSION
@@
-33,13
+35,13
@@
VERSIONIDS=vids
endif
CHAPTERS := $(SITE) blurb intro gs using config pscp psftp plink pubkey
endif
CHAPTERS := $(SITE) blurb intro gs using config pscp psftp plink pubkey
-CHAPTERS += pageant errors faq feedback licence
+CHAPTERS += pageant errors faq feedback licence
udp
CHAPTERS += index $(VERSIONIDS)
INPUTS = $(patsubst %,%.but,$(CHAPTERS))
# This is temporary. Hack it locally or something.
CHAPTERS += index $(VERSIONIDS)
INPUTS = $(patsubst %,%.but,$(CHAPTERS))
# This is temporary. Hack it locally or something.
-HALIBUT =
$(HOME)/src/halibut/build/
halibut
+HALIBUT = halibut
index.html: $(INPUTS)
$(HALIBUT) --text --html --winhelp $(INPUTS)
index.html: $(INPUTS)
$(HALIBUT) --text --html --winhelp $(INPUTS)