tweaks to match cvstools/Release-vars.mk and Release-targets.mk changes

diff --git a/website/Makefile b/website/Makefile
index da5c766064007ffdc20e94f7f5ae642945f45226..c0e7a58f10e29087b2f4f7f463edc14281ee564f 100644 (file)
--- a/website/Makefile
+++ b/website/Makefile
@@ -1,11 +1,18 @@
 # $Id$
 
 include ../cvstools/Makefile.incl
+include ../cvstools/Release-vars.mk
 
-DISTRO=website
-RELVER=$(shell cat ./VERSION)
-ZIPVER=$(RELVER)
-DISTRIB_DEPENDS=example
+DISTRO = website
+
+# value of DISTRIB_DEPENDS is a space-separated list of any
+# targets for this distro's "distrib" target to depend on
+DISTRIB_DEPENDS = example
+
+# value of ZIP_EXCLUDES is a space-separated list of any file or
+# directory names (shell wildcards OK) that should be excluded
+# from the zip file and tarball for the release
+DISTRIB_EXCLUDES = tests$$
 
 .PHONY : distrib clean example
 
@@ -25,10 +32,4 @@ realclean: clean
        $(MAKE) -C extensions realclean
        $(MAKE) -C example realclean
 
-# the following is used only for release builds; ignore it if you
-# are doing a non-release build
-excludes:
-       rm -f $(TMP)/tar.exclude
-       touch $(TMP)/tar.exclude
-
-include ../cvstools/Makefile.common
+include ../cvstools/Release-targets.mk