diff options
| author | Yukihiro Nakai <nakai@FreeBSD.org> | 1999-10-06 04:30:48 +0000 |
|---|---|---|
| committer | Yukihiro Nakai <nakai@FreeBSD.org> | 1999-10-06 04:30:48 +0000 |
| commit | 10e542706b670bbc5c644c58e517738d2e4a1e4a (patch) | |
| tree | dce09f0e15474d7bc8e856360661b0fe3f2a373a /x11-wm/wm2/files/patch-aa | |
| parent | Submitted by:"KATO Tsuguru" <tkato@prontomail.ne.jp> (diff) | |
Submitted by: "KATO Tsuguru" <tkato@prontomail.ne.jp>
Update to version 4.0
Notes
Notes:
svn path=/head/; revision=22190
Diffstat (limited to 'x11-wm/wm2/files/patch-aa')
| -rw-r--r-- | x11-wm/wm2/files/patch-aa | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/x11-wm/wm2/files/patch-aa b/x11-wm/wm2/files/patch-aa index 9cd6f07f2cf6..cd93cca6a47e 100644 --- a/x11-wm/wm2/files/patch-aa +++ b/x11-wm/wm2/files/patch-aa @@ -1,27 +1,27 @@ ---- Makefile.orig Thu Jan 16 06:20:29 1997 -+++ Makefile Sat Oct 3 20:01:54 1998 -@@ -1,10 +1,13 @@ +--- Makefile.orig Fri Mar 21 20:12:30 1997 ++++ Makefile Wed Sep 22 23:55:40 1999 +@@ -1,9 +1,12 @@ - # if you want pixmaps you'll need Xpm, so add -lXpm to the next line -LIBS = -L/usr/X11/lib -lXext -lX11 -lXmu -lm -+LIBS = -L$(X11BASE)/lib -lXext -lX11 -lXmu -lm ++LIBS = -L$(PREFIX)/lib -lXext -lX11 -lXmu -lm +.if $(PORTOBJFORMAT) == "elf" -+LIBS += -Wl,-rpath,$(X11BASE)/lib ++LIBS += -Wl,-rpath,$(PREFIX)/lib +.endif - CC = gcc - CCC = gcc +-CC = gcc +-CCC = gcc -CFLAGS = -O2 -+CFLAGS += -O2 -I$(X11BASE)/include - OBJECTS = Border.o Buttons.o Client.o Events.o Main.o Manager.o Rotated.o listimpl.o ++CC ?= gcc ++CCC = $(CC) ++CFLAGS += -I$(PREFIX)/include + OBJECTS = Border.o Buttons.o Client.o Events.o Main.o Manager.o Rotated.o .c.o: -@@ -14,7 +17,7 @@ +@@ -13,7 +16,6 @@ $(CCC) -c $(CFLAGS) $< wm2: $(OBJECTS) - mv -f wm2 wm2.old >& /dev/null || true -+ mv -f wm2 wm2.old 2> /dev/null || true $(CCC) -o wm2 $(OBJECTS) $(LIBS) depend: |