commit 16550e66500ac3a81515a9953cb80607822ff88a Author: Ximin Luo infinity0@gmx.com Date: Tue Nov 5 22:05:27 2013 +0000

re-fix #9940 on the new split Makefiles --- Makefile | 6 ++++-- Makefile.client | 8 +++++++- 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile index 3777271..2429f33 100644 --- a/Makefile +++ b/Makefile @@ -23,6 +23,8 @@ PYTHON = python PYTHON_W32 = $(PYTHON)

MAKE_CLIENT = $(MAKE) -f Makefile.client PYTHON="$(PYTHON)" +# don't rebuild man pages due to VCS giving spurious timestamps, see #9940 +REBUILD_MAN = 0

# all is N/A for a binary package, but include for completeness all: dist @@ -31,7 +33,7 @@ DISTDIR = dist/$(DISTNAME) $(DISTDIR): Makefile.client setup-common.py $(THISFILE) mkdir -p $(DISTDIR) $(MAKE_CLIENT) DESTDIR=$(DISTDIR) bindir=/ docdir=/ man1dir=/doc/ \ - install + REBUILD_MAN="$(REBUILD_MAN)" install $(PYTHON) setup-common.py build_py -d $(DISTDIR)

dist/%.zip: dist/% @@ -57,7 +59,7 @@ $(DISTDIR_W32): $(PY2EXE_TMPDIR) $(THISFILE) mkdir -p $(DISTDIR_W32) $(MAKE_CLIENT) DESTDIR=$(DISTDIR_W32) bindir=/ docdir=/ man1dir=/doc/ \ DST_SCRIPT= DST_MAN1='$$(SRC_MAN1)' \ - install + REBUILD_MAN="$(REBUILD_MAN)" install cp -t $(DISTDIR_W32) $(PY2EXE_TMPDIR)/dist/*

dist-exe: force-dist-exe $(DISTDIR_W32).zip diff --git a/Makefile.client b/Makefile.client index 0cb676c..9ebc576 100644 --- a/Makefile.client +++ b/Makefile.client @@ -48,11 +48,17 @@ DST_ALL = $(DST_SCRIPT) $(DST_DOC) $(DST_MAN1) TEST_PY = flashproxy-client-test.py TEST_ALL = $(TEST_PY)

+REBUILD_MAN = 1 + all: $(DST_ALL) $(THISFILE)

-%.1: %.1.txt $(THISFILE) +%.1: %.1.txt +ifeq ($(REBUILD_MAN),0) + @echo "warning: $@ *may* be out-of-date; if so then rm and re-checkout from VCS or force a re-build with REBUILD_MAN=1" +else rm -f $@ a2x --no-xmllint --xsltproc-opts "--stringparam man.th.title.max.length 24" -d manpage -f manpage $< +endif

install: all mkdir -p $(DESTDIR)$(bindir)