Tweak variable names

diff --git a/slides/Makefile b/slides/Makefile
index 6cd3c7ebed816ee320a401d4cfd02c3640c4018c..0bb4e57f2325ebaa54310025d978ff2b4bf5a1f9 100644 (file)
--- a/slides/Makefile
+++ b/slides/Makefile
@@ -1,7 +1,7 @@
 include ../cvstools/Makefile.incl
 ZIPVER=
-MERGEVER=
-NEWVER=
+DIFFVER=
+NEXTVER=
 
 all: slides.dtd
 
@@ -26,17 +26,17 @@ test: check
 distrib: check
        $(MAKE) -C doc all
        $(CVS2LOG) -w
-ifeq ($(MERGEVER),)
+ifeq ($(DIFFVER),)
        $(MERGELOGS) > WhatsNew
 else
-       $(MERGELOGS) -v $(MERGEVER) > WhatsNew
+       $(MERGELOGS) -v $(DIFFVER) > WhatsNew
 endif
 
 newversion:
-ifeq ($NEWVER),)
+ifeq ($NEXTVER),)
        $(NEXTVERSION)
 else
-       $(NEXTVERSION) -v $(NEWVER)
+       $(NEXTVERSION) -v $(NEXTVER)
 endif
        make distrib