summaryrefslogtreecommitdiff
path: root/sysutils
diff options
context:
space:
mode:
authorChris Piazza <cpiazza@FreeBSD.org>1999-08-26 21:02:33 +0000
committerChris Piazza <cpiazza@FreeBSD.org>1999-08-26 21:02:33 +0000
commit5a665241e9aae020fb41352fb0bfb881a2369e00 (patch)
tree3c3a960eaa00a6eb05f89c189fd923cd3268bf28 /sysutils
parentUpdate to version 0.28.2.1 (diff)
Respect CFLAGS and CC
PR: 13380 Submitted by: Maxim Sobolev <sobomax@altavista.net>
Notes
Notes: svn path=/head/; revision=21002
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/wmapm/files/patch-aa26
1 files changed, 22 insertions, 4 deletions
diff --git a/sysutils/wmapm/files/patch-aa b/sysutils/wmapm/files/patch-aa
index 0eb740b7ed53..8a7ad23a27d0 100644
--- a/sysutils/wmapm/files/patch-aa
+++ b/sysutils/wmapm/files/patch-aa
@@ -1,10 +1,28 @@
---- Makefile.~1~ Tue Dec 15 23:58:08 1998
-+++ Makefile Fri Jul 2 23:01:51 1999
+--- Makefile.orig Tue Dec 15 16:58:08 1998
++++ Makefile Wed Aug 25 23:55:58 1999
@@ -1,6 +1,6 @@
- CC = gcc
- CFLAGS = -O2 -Wall
+-CC = gcc
+-CFLAGS = -O2 -Wall
-INCDIR = -I/usr/X11R6/include/X11
++CC? = gcc
++CFLAGS? = -O2 -Wall
+INCDIR = -I/usr/X11R6/include
DESTDIR= /usr/X11R6
LIBDIR = -L/usr/X11R6/lib
LIBS = -lXpm -lX11 -lXext
+@@ -8,13 +8,13 @@
+ ../wmgeneral/wmgeneral.o
+
+ .c.o:
+- $(CC) $(COPTS) -D$(shell echo `uname -s`) -c $< -o $*.o $(INCDIR)
++ $(CC) $(CFLAGS) -D$(shell echo `uname -s`) -c $< -o $*.o $(INCDIR)
+
+ all: wmapm.o wmapm
+
+ wmapm.o: wmapm_master.xpm wmapm_mask.xbm wmapm.h
+ wmapm: $(OBJS)
+- $(CC) $(COPTS) $(SYSTEM) -o wmapm $^ $(INCDIR) $(LIBDIR) $(LIBS)
++ $(CC) $(CFLAGS) $(SYSTEM) -o wmapm $^ $(INCDIR) $(LIBDIR) $(LIBS)
+
+ clean:
+ for i in $(OBJS) ; do \