aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjeh <jeh@FreeBSD.org>2000-11-01 05:00:02 +0800
committerjeh <jeh@FreeBSD.org>2000-11-01 05:00:02 +0800
commitafb0f9884f5efa41ec5f2cee2c7cac2de035bb18 (patch)
tree457790313b4b15208595c1c8dd727611d289314c
parent4fe3976a7b67703bec1a2f259154b71362ea8c83 (diff)
downloadfreebsd-ports-gnome-afb0f9884f5efa41ec5f2cee2c7cac2de035bb18.tar.gz
freebsd-ports-gnome-afb0f9884f5efa41ec5f2cee2c7cac2de035bb18.tar.zst
freebsd-ports-gnome-afb0f9884f5efa41ec5f2cee2c7cac2de035bb18.zip
Allow both SUP_UPDATE and CVS_UPDATE to be used, similar to src/Makefile
PR: 17903 Submitted by: James Housley <jim@thehousleys.net> Reviewed by: billf
-rw-r--r--Makefile9
1 files changed, 4 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index e48790981277..1bba492159bf 100644
--- a/Makefile
+++ b/Makefile
@@ -88,11 +88,7 @@ CVS?= cvs
SUPFLAGS+= -h ${SUPHOST}
.endif
update:
-.if defined(SUP_UPDATE)
-.if !defined(PORTSSUPFILE)
- @${ECHO_MSG} "Error: Please define PORTSSUPFILE before doing make update."
- @exit 1
-.endif
+.if defined(SUP_UPDATE) && defined(PORTSSUPFILE)
@echo "--------------------------------------------------------------"
@echo ">>> Running ${SUP}"
@echo "--------------------------------------------------------------"
@@ -102,6 +98,9 @@ update:
@echo ">>> Updating ${.CURDIR} from cvs repository" ${CVSROOT}
@echo "--------------------------------------------------------------"
cd ${.CURDIR}; ${CVS} -q update -P -d
+.elif defined(SUP_UPDATE) && !defined(PORTSSUPFILE)
+ @${ECHO_MSG} "Error: Please define PORTSSUPFILE before doing make update."
+ @exit 1
.else
@${ECHO_MSG} "Error: Please define either SUP_UPDATE or CVS_UPDATE first."
.endif