diff options
| author | Steve Price <steve@FreeBSD.org> | 1998-10-04 04:05:09 +0000 |
|---|---|---|
| committer | Steve Price <steve@FreeBSD.org> | 1998-10-04 04:05:09 +0000 |
| commit | c79dcce515e2768ad1314261a559b2a8c22dea7b (patch) | |
| tree | e032acf1c40bc19bc37e75f9847b4e63c16ca94d /x11-wm/wm2/files | |
| parent | Remove empty directory on deinstall. (diff) | |
Fix build for ELF.
Notes
Notes:
svn path=/head/; revision=13624
Diffstat (limited to 'x11-wm/wm2/files')
| -rw-r--r-- | x11-wm/wm2/files/patch-aa | 69 |
1 files changed, 27 insertions, 42 deletions
diff --git a/x11-wm/wm2/files/patch-aa b/x11-wm/wm2/files/patch-aa index ae615aeff8fd..9cd6f07f2cf6 100644 --- a/x11-wm/wm2/files/patch-aa +++ b/x11-wm/wm2/files/patch-aa @@ -1,42 +1,27 @@ -*** Makefile.orig Thu Jan 16 21:20:29 1997 ---- Makefile Sat Mar 1 20:56:39 1997 -*************** -*** 1,10 **** - - # if you want pixmaps you'll need Xpm, so add -lXpm to the next line -! LIBS = -L/usr/X11/lib -lXext -lX11 -lXmu -lm - - CC = gcc - CCC = gcc -! CFLAGS = -O2 - OBJECTS = Border.o Buttons.o Client.o Events.o Main.o Manager.o Rotated.o listimpl.o - - .c.o: ---- 1,10 ---- - - # if you want pixmaps you'll need Xpm, so add -lXpm to the next line -! LIBS = -L/usr/X11R6/lib -lXext -lX11 -lXmu -lm - - CC = gcc - CCC = gcc -! CFLAGS += -O2 -I/usr/X11R6/include - OBJECTS = Border.o Buttons.o Client.o Events.o Main.o Manager.o Rotated.o listimpl.o - - .c.o: -*************** -*** 14,20 **** - $(CCC) -c $(CFLAGS) $< - - wm2: $(OBJECTS) -! mv -f wm2 wm2.old >& /dev/null || true - $(CCC) -o wm2 $(OBJECTS) $(LIBS) - - depend: ---- 14,20 ---- - $(CCC) -c $(CFLAGS) $< - - wm2: $(OBJECTS) -! mv -f wm2 wm2.old 2> /dev/null || true - $(CCC) -o wm2 $(OBJECTS) $(LIBS) - - depend: +--- Makefile.orig Thu Jan 16 06:20:29 1997 ++++ Makefile Sat Oct 3 20:01:54 1998 +@@ -1,10 +1,13 @@ + + # 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 ++.if $(PORTOBJFORMAT) == "elf" ++LIBS += -Wl,-rpath,$(X11BASE)/lib ++.endif + + 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 + + .c.o: +@@ -14,7 +17,7 @@ + $(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: |