From c3fdf7c917cab4d27f13d5dd52a45b860f686cbf Mon Sep 17 00:00:00 2001
From: Cody Boone Ferguson <53008573+xexyl@users.noreply.github.com>
Date: Thu, 7 Dec 2023 10:49:18 -0800
Subject: [PATCH] Improve how to redefine macros in 2004/gavare

Now one can do

    make clobber XX=640 YY=480 AA=3 alt

or whatever, rather than the more awkward setting of CDEFINE.
---
 2004/gavare/Makefile  | 6 +++++-
 2004/gavare/README.md | 8 ++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/2004/gavare/Makefile b/2004/gavare/Makefile
index 673fc7fd4..18fd65c94 100644
--- a/2004/gavare/Makefile
+++ b/2004/gavare/Makefile
@@ -56,9 +56,13 @@ CSTD= -std=gnu99
 #
 ARCH=
 
+# variables for the macros for easier redefining
+XX= 1024
+YY= 768
+AA= 3
 # Defines that are needed to compile
 #
-CDEFINE= -DXX=1024 -DYY=768 -DAA=3
+CDEFINE= -DXX=${XX} -DYY=${YY} -DAA=${AA}
 
 # Include files that are needed to compile
 #
diff --git a/2004/gavare/README.md b/2004/gavare/README.md
index 21c046b6c..598d2da01 100644
--- a/2004/gavare/README.md
+++ b/2004/gavare/README.md
@@ -46,17 +46,17 @@ make alt
 To change the default size from 1024x768 try:
 
 ```sh
-make clobber CDEFINE="-DXX=640 -DYY=480" alt
+make clobber XX=640 YY=480 alt
 ```
 
 You might also wish to change the anti-alias setting:
 
 ```sh
-make clobber CDEFINE="-DAA=2" alt
+make clobber AA=2 alt
 ```
 
-This is not possible with the author's version but it is with the Windows
-version (see below).
+This is not possible with the author's version but it is with the alt versions
+(Windows - see below - and otherwise).
 
 As the Windows version will not compile on most viewers' systems we do not build
 it with `make alt`; instead try: