From 7794b19eea624fbca8b76c5d8576eb2c78652100 Mon Sep 17 00:00:00 2001
From: sezero <sezero@af15c1b1-3010-417e-b628-4374ebc0bcbd>
Date: Wed, 5 Sep 2012 16:24:57 +0000
Subject: [PATCH] minor Makefile correction

git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@712 af15c1b1-3010-417e-b628-4374ebc0bcbd
---
 quakespasm/Quake/Makefile        | 8 ++++----
 quakespasm/Quake/Makefile.darwin | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/quakespasm/Quake/Makefile b/quakespasm/Quake/Makefile
index 0c70fc9d..65abbb6f 100644
--- a/quakespasm/Quake/Makefile
+++ b/quakespasm/Quake/Makefile
@@ -81,8 +81,8 @@ X11BASE_GUESS := $(shell \
 X11BASE	?= $(X11BASE_GUESS)
 
 ifneq ($(X11BASE),)
-X11_LFLAGS := -L$(X11BASE)/lib
-X11_CFLAGS := -I$(X11BASE)/include
+LDFLAGS+= -L$(X11BASE)/lib
+CFLAGS += -I$(X11BASE)/include
 endif
 
 SDL_CONFIG ?= sdl-config
@@ -161,7 +161,7 @@ DEFAULT_TARGET := quakespasm
 # ---------------------------
 
 %.o:	%.c
-	$(CC) $(DFLAGS) -c $(CFLAGS) $(X11_CFLAGS) $(SDL_CFLAGS) -o $@ $^
+	$(CC) $(DFLAGS) -c $(CFLAGS) $(SDL_CFLAGS) -o $@ $^
 
 # ----------------------------------------------------------------------------
 # objects
@@ -255,7 +255,7 @@ OBJS := strlcat.o \
 # ------------------------
 
 quakespasm:	$(OBJS)
-	$(LINKER) $(OBJS) $(X11_LFLAGS) $(LDFLAGS) $(LIBS) $(SDL_LIBS) -o $@
+	$(LINKER) $(OBJS) $(LDFLAGS) $(LIBS) $(SDL_LIBS) -o $@
 	$(call do_strip,$@)
 
 release:	quakespasm
diff --git a/quakespasm/Quake/Makefile.darwin b/quakespasm/Quake/Makefile.darwin
index f7555c81..ae3ab31e 100644
--- a/quakespasm/Quake/Makefile.darwin
+++ b/quakespasm/Quake/Makefile.darwin
@@ -250,7 +250,7 @@ OBJS := strlcat.o \
 # ------------------------
 
 quakespasm:	$(OBJS)
-	$(LINKER) $(OBJS) $(SDL_LIBS) $(LDFLAGS) $(LIBS) -o $@
+	$(LINKER) $(OBJS) $(LDFLAGS) $(LIBS) $(SDL_LIBS) -o $@
 	$(call do_strip,$@)
 
 release:	quakespasm