diff options
| author | Satoshi Taoka <taoka@FreeBSD.org> | 2000-09-27 15:32:10 +0000 |
|---|---|---|
| committer | Satoshi Taoka <taoka@FreeBSD.org> | 2000-09-27 15:32:10 +0000 |
| commit | b83307790bc0b8be0dc3eff48674d8201df430da (patch) | |
| tree | ce6ae0bbdd9d54ca5997867b8f2ff6d04f7e9efb /sysutils/wmapm/files | |
| parent | f5208351173ba425e5b923e2f36b8a16d35eeac8 (diff) | |
Notes
Diffstat (limited to 'sysutils/wmapm/files')
| -rw-r--r-- | sysutils/wmapm/files/patch-aa | 36 |
1 files changed, 24 insertions, 12 deletions
diff --git a/sysutils/wmapm/files/patch-aa b/sysutils/wmapm/files/patch-aa index 8a7ad23a27d0..acc9fc664756 100644 --- a/sysutils/wmapm/files/patch-aa +++ b/sysutils/wmapm/files/patch-aa @@ -1,28 +1,40 @@ ---- Makefile.orig Tue Dec 15 16:58:08 1998 -+++ Makefile Wed Aug 25 23:55:58 1999 -@@ -1,6 +1,6 @@ +--- Makefile.orig Wed Jan 12 01:42:25 2000 ++++ Makefile Tue Sep 19 05:24:13 2000 +@@ -1,20 +1,20 @@ -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 +-INCDIR = -I/usr/X11R6/include +-DESTDIR= /usr/X11R6 +-LIBDIR = -L/usr/X11R6/lib ++CC ?= gcc ++CFLAGS ?= -O2 -Wall ++INCDIR = -I${X11BASE}/include ++DESTDIR= ${PREFIX} ++LIBDIR = -L${X11BASE}/lib LIBS = -lXpm -lX11 -lXext -@@ -8,13 +8,13 @@ + OBJS = wmapm.o \ ../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) ++ $(CC) $(CFLAGS) -D$(OPSYS) -c $< -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) ++ $(CC) $(CFLAGS) $(SYSTEM) -o wmapm $(OBJS) $(LIBDIR) $(LIBS) clean: for i in $(OBJS) ; do \ +@@ -23,7 +23,6 @@ + rm -f wmapm + + install:: wmapm +- install -s -m 0755 wmapm $(DESTDIR)/bin +- install -m 0644 wmapm.1 $(DESTDIR)/man/man1 +- chmod +s $(DESTDIR)/bin/wmapm ++ ${BSD_INSTALL_PROGRAM} wmapm $(DESTDIR)/bin ++ ${BSD_INSTALL_MAN} wmapm.1 $(DESTDIR)/man/man1 + |