diff options
| author | Steve Price <steve@FreeBSD.org> | 1998-09-28 02:17:33 +0000 |
|---|---|---|
| committer | Steve Price <steve@FreeBSD.org> | 1998-09-28 02:17:33 +0000 |
| commit | c1e62c442c320ff68dcc77298b2a82d5f9c6892c (patch) | |
| tree | 0b6c46fa360e6a27c985023f6dcc5c2013994c9e /games | |
| parent | Move manpages from pkg/PLIST to MAN* macro in Makefile and remove (diff) | |
Fix build for ELF.
Notes
Notes:
svn path=/head/; revision=13497
Diffstat (limited to 'games')
| -rw-r--r-- | games/pp/Makefile | 4 | ||||
| -rw-r--r-- | games/pp/files/patch-aa | 9 | ||||
| -rw-r--r-- | games/xbomb/files/patch-aa | 11 |
3 files changed, 15 insertions, 9 deletions
diff --git a/games/pp/Makefile b/games/pp/Makefile index 4d3e1d445368..12a7f71af4cd 100644 --- a/games/pp/Makefile +++ b/games/pp/Makefile @@ -3,7 +3,7 @@ # Date created: 21 May 1998 # Whom: Andrey Zakhvatov # -# $Id: Makefile,v 1.3 1998/08/07 23:56:21 asami Exp $ +# $Id: Makefile,v 1.4 1998/08/12 06:29:28 asami Exp $ # DISTNAME= pp-0.01 @@ -19,7 +19,7 @@ USE_X_PREFIX= yes WRKSRC= ${WRKDIR}/ppsrc pre-build: - @ cd ${WRKSRC}; make depend + @ cd ${WRKSRC}; ${MAKE} ${MAKE_ENV} depend do-install: @ ${INSTALL_PROGRAM} ${WRKSRC}/pp ${PREFIX}/bin/pp.bin diff --git a/games/pp/files/patch-aa b/games/pp/files/patch-aa index 8624f86e9462..c1cb4e9e7b2d 100644 --- a/games/pp/files/patch-aa +++ b/games/pp/files/patch-aa @@ -1,6 +1,6 @@ ---- Makefile Sat Apr 5 17:08:26 1997 -+++ /home/andy/tmp/wrk/Makefile Mon Jun 8 22:35:44 1998 -@@ -1,10 +1,10 @@ +--- Makefile.orig Sat Apr 5 11:08:26 1997 ++++ Makefile Sun Sep 27 15:25:36 1998 +@@ -1,10 +1,13 @@ ####### This section was automatically generated from -INCDIR = $(QTDIR)/include @@ -10,6 +10,9 @@ YACCCFLAGS = -Wno-unused -Wno-parentheses -LFLAGS = -L$(QTDIR)/lib -lqt +LFLAGS = -L${X11BASE}/lib -lqt ++.if ${PORTOBJFORMAT} == "elf" ++LFLAGS+= -Wl,-rpath,${X11BASE}/lib ++.endif CC = gcc MOC = moc SHELL = /bin/sh diff --git a/games/xbomb/files/patch-aa b/games/xbomb/files/patch-aa index 805b862dd68d..294e7f219999 100644 --- a/games/xbomb/files/patch-aa +++ b/games/xbomb/files/patch-aa @@ -1,6 +1,6 @@ ---- Makefile.orig Sat Jan 20 22:02:46 1996 -+++ Makefile Fri Feb 20 10:27:38 1998 -@@ -12,33 +12,27 @@ +--- Makefile.orig Sat Jan 20 15:02:46 1996 ++++ Makefile Sun Sep 27 03:06:34 1998 +@@ -12,33 +12,30 @@ # for conditions under which this file may be redistributed. # @@ -17,6 +17,9 @@ - -COMPILE=$(CC) -c $(CFLAGS) +XLIB=-L${X11BASE}/lib -lXaw -lXmu -lXt -lX11 -lcompat ++.if ${PORTOBJFORMAT} == "elf" ++XLIB+= -Wl,-rpath,${X11BASE}/lib ++.endif LINK=$(CC) @@ -39,7 +42,7 @@ xbomb.o : xbomb.c xbomb.h xwindow.o : xwindow.c xbomb.h icon.h hiscore.o : hiscore.c xbomb.h -@@ -54,7 +48,7 @@ +@@ -54,7 +51,7 @@ strip xbomb install -d $(INSTDIR)/bin install -d $(INSTDIR)/man/man6 |