aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar David Aspinall <da@inf.ed.ac.uk>2004-02-07 18:58:09 +0000
committerGravatar David Aspinall <da@inf.ed.ac.uk>2004-02-07 18:58:09 +0000
commitd024ffa2dd8c85a9fd0a997b57b026a639248b72 (patch)
tree30dd73d8ceb34afbb66f70a7f1e44a4d2128909e
parentded2112d3a756669e9521bdc284fef984741957a (diff)
Adjust RELEASEDIR and GOLIVE for pub to /group/project on DICE.
-rw-r--r--Makefile.devel14
1 files changed, 9 insertions, 5 deletions
diff --git a/Makefile.devel b/Makefile.devel
index c3d8d039..c3ca5927 100644
--- a/Makefile.devel
+++ b/Makefile.devel
@@ -123,18 +123,22 @@ RELEASENAME = $(NAME)-$(VERSION)
DEVELRELEASENAME = $(NAME)-$(VERSION)-devel
CVS_RELEASENAME = Release-$(CVS_VERSION)
-# Where to release (i.e. copy) a new distribution to
-RELEASEDIR = /home/proofgen/www/
+# Where to release (i.e. copy) a new distribution to.
+# This may be the final directory (local) or temporary directory.
+# was: RELEASEDIR = /home/proofgen/www
+RELEASEDIR = /tmp/proofgeneral-www/
# How to make the release "live". (Could be "true" to do nothing).
-# GOLIVE="scp -r $RELEASEDIR tweed:/home/proofgen/www"
-GOLIVE=true
+# was: GOLIVE=true
+GOLIVE="scp -pr $RELEASEDIR ssh.inf.ed.ac.uk:/group/project/proofgen/web/"
+
CVSNAME = ProofGeneral
# Remote commands to use CVS in server mode and install files.
# With these settings the build can be done remotely.
# CVSROOT = :pserver:da@cvs.inf.ed.ac.uk:/disk/cvs/proofgen
+CVSROOT=$(shell cat CVS/Root)
# Emacs for batch compiling
BATCHEMACS=xemacs -batch -q -no-site-file
@@ -376,7 +380,7 @@ dist:
@echo "*************************************************"
if [ -z "$(NOCVS)" ]; then \
(cd $(DISTBUILDIR); \
- cvs export -kv -r "${CVS_RELEASENAME}" -d ${RELEASENAME} ${CVSNAME}) \
+ cvs -d $(CVSROOT) export -kv -r "${CVS_RELEASENAME}" -d ${RELEASENAME} ${CVSNAME}) \
else \
mkdir -p $(DISTBUILDIR)/$(RELEASENAME); \
cp -pr . $(DISTBUILDIR)/$(RELEASENAME); \