From c5ee3aadd7954e90041dfe7e3ddb3dbcda6d7f2d Mon Sep 17 00:00:00 2001
From: Russ Cox <rsc@swtch.com>
Date: Sat, 12 Nov 2005 14:00:36 +0000
Subject: [PATCH] accomodate bsd, x

---
 Make.unix        | 5 +++--
 gui-x11/Makefile | 3 ---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/Make.unix b/Make.unix
index 9993b2b..c5cecaa 100644
--- a/Make.unix
+++ b/Make.unix
@@ -4,12 +4,13 @@ PTHREAD=-pthread
 AR=ar
 AS=as
 RANLIB=ranlib
+X11=/usr/X11R6
 CC=gcc
-CFLAGS=-Wall -Wno-missing-braces -ggdb -I$(ROOT) -I$(ROOT)/include -I$(ROOT)/kern -c -D_THREAD_SAFE $(PTHREAD) -O2
+CFLAGS=-Wall -Wno-missing-braces -ggdb -I$(ROOT) -I$(ROOT)/include -I$(ROOT)/kern -c -I$(X11)/include -D_THREAD_SAFE $(PTHREAD) -O2
 O=o
 OS=posix
 GUI=x11
-LDADD=-L/usr/X11R6/lib -lX11 -ggdb
+LDADD=-L$(X11)/lib -lX11 -ggdb
 LDFLAGS=$(PTHREAD)
 TARG=drawterm
 
diff --git a/gui-x11/Makefile b/gui-x11/Makefile
index 76b50d3..c7b735a 100644
--- a/gui-x11/Makefile
+++ b/gui-x11/Makefile
@@ -15,6 +15,3 @@ $(LIB): $(OFILES)
 	$(AR) r $(LIB) $(OFILES)
 	$(RANLIB) $(LIB)
 
-%.$O: %.c
-	$(CC) $(CFLAGS) $*.c
-