From 34fdf05fcfa807d083649306ddea0ddaa4b55eb3 Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Mon, 21 May 2007 10:45:34 +0000 Subject: [PATCH] separate the Windows version of uploading the docs, and fix it --- Makefile | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index dd1e746..16a352d 100644 --- a/Makefile +++ b/Makefile @@ -400,13 +400,22 @@ binary-dist :: publish-binary-dist endif .PHONY: publish-binary-dist -publish-binary-dist : +publish-binary-dist :: @for i in 0 1 2 3 4 5 6 7 8 9; do \ echo "Try $$i: $(PublishCp) $(BIN_DIST_TARBALL) $(PublishLocation)/dist"; \ if $(PublishCp) $(BIN_DIST_TARBALL) $(PublishLocation)/dist; then break; fi; \ done - $(PublishCp) -r $(FPTOOLS_TOP)/$(BIN_DIST_NAME)/share/html/* $(PublishLocation)/docs +ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32" +# On Windows, we cannot use absoluate pathnames to rsync, because they look +# like remote pathnames ("c:/foo/bar"). Also, the docs reside in doc/ +# rather than share/, due to prep-bin-dist-mingw. +publish-binary-dist :: + $(PublishCp) -r $(FPTOOLS_TOP)/$(BIN_DIST_NAME)/doc/html/* $(PublishLocation)/docs +else +publish-binary-dist :: + $(PublishCp) -r $(BIN_DIST_DIR)/share/html/* $(PublishLocation)/docs +endif binary-dist:: @echo "Mechanical and super-natty! Inspect the result and *if* happy; freeze, sell and get some sleep!" -- 1.7.10.4