From 3f86df2fa248dde665dfa045d20bfa930494b0e9 Mon Sep 17 00:00:00 2001 From: montanaro Date: Fri, 2 Apr 2010 01:51:56 +0000 Subject: [PATCH] Update for the new way SF does rsync. Current first attempt requires the person doing the install to give their SF login as the value of the make/environment variable SFUSER. For example: make install SFUSER=montanaro If you don't set SFUSER it complains loudly. --- website/scripts/make.rules | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/website/scripts/make.rules b/website/scripts/make.rules index 167b91f1..901e3c13 100644 --- a/website/scripts/make.rules +++ b/website/scripts/make.rules @@ -20,9 +20,9 @@ TARGETS = $(filter-out *.html,$(SOURCES:%.ht=%.html)) $(EXTRA_TARGETS) # Where to upload stuff for make install. LIVE_ROOT is the actual # physical location of files on the server. -LIVE_HOST = shell1.sourceforge.net -LIVE_ROOT = /home/groups/s/sp/spambayes/htdocs/ -LIVE_DEST = $(LIVE_HOST):$(LIVE_ROOT)/$(ROOT_OFFSET) +LIVE_HOST = web.sourceforge.net +LIVE_ROOT = htdocs +LIVE_DEST = $(SFUSER),spambayes@$(LIVE_HOST):$(LIVE_ROOT)/$(ROOT_OFFSET) # rsync definitions. RSYNC_RSH = ssh @@ -81,6 +81,11 @@ realclean: clean -rm $(GENERATED_HTML) install: all local_install + @if [ -z "$(SFUSER)" ]; then \ + echo "You have to specify a SourceForge username in SFUSER"; \ + echo "e.g., make install SFUSER=montanaro"; \ + false; \ + fi @if [ -z "$(ROOT_OFFSET)" ]; then \ echo "You have to specify a value for 'ROOT_OFFSET' in the makefile!"; \ false; \