diff options
| author | garbled <garbled@pkgsrc.org> | 1998-08-27 14:06:07 +0000 |
|---|---|---|
| committer | garbled <garbled@pkgsrc.org> | 1998-08-27 14:06:07 +0000 |
| commit | 2896fa84839e6dd520f152478fdf78c4e92832a2 (patch) | |
| tree | 3115d0a8e4b3ee5696c7b5301ba6b7da2728485f /games/finalbattle | |
| parent | c9ab23f10f42c84d11c879ea409a82917542b8e0 (diff) | |
| download | pkgsrc-2896fa84839e6dd520f152478fdf78c4e92832a2.tar.gz | |
Remove a ton of cruft relating to ELF building of pkgs. The trick I had
previously used with OBJECT_FMT is not necc. with the revelation that
-Wl,-R works. Also fixed alot of PREFIX -> X11BASE typos.
Diffstat (limited to 'games/finalbattle')
| -rw-r--r-- | games/finalbattle/Makefile | 6 | ||||
| -rw-r--r-- | games/finalbattle/patches/patch-aa | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/games/finalbattle/Makefile b/games/finalbattle/Makefile index 52827230838..b1d37e113be 100644 --- a/games/finalbattle/Makefile +++ b/games/finalbattle/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 1998/08/20 15:16:54 tsarna Exp $ +# $NetBSD: Makefile,v 1.3 1998/08/27 14:06:07 garbled Exp $ # DISTNAME= finalbattle.0.0 @@ -15,7 +15,3 @@ WRKSRC= ${WRKDIR}/final USE_X11= yes .include "../../mk/bsd.pkg.mk" -.if (${OBJECT_FMT} == "ELF") -RPATH= -Wl,-rpath,${PREFIX}/lib -.endif -MAKE_ENV+= RPATH=${RPATH} diff --git a/games/finalbattle/patches/patch-aa b/games/finalbattle/patches/patch-aa index b4a04b38f88..3928c94551a 100644 --- a/games/finalbattle/patches/patch-aa +++ b/games/finalbattle/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.2 1998/08/07 10:40:40 agc Exp $ +$NetBSD: patch-aa,v 1.3 1998/08/27 14:06:09 garbled Exp $ --- makefile.orig Thu Apr 2 21:55:07 1998 +++ makefile Sun Jul 26 06:51:44 1998 @@ -9,12 +9,12 @@ $NetBSD: patch-aa,v 1.2 1998/08/07 10:40:40 agc Exp $ -#XLIB=-L/usr/openwin/lib -lX11 -XLIB=-L/usr/X11/lib -lX11 - -+XLIB= $(RPATH) -L$(PREFIX)/lib -lX11 ++XLIB= -Wl,-R$(X11BASE)/lib -L$(X11BASE)/lib -lX11 +INSTALLROOT=$(PREFIX) +DATA=$(PREFIX)/share/finalbattle +SPRITES=$(PREFIX)/share/finalbattle/sprites +DEFS=-DSPRITES=\"$(SPRITES)\" -DDATA=\"$(DATA)\" -+CFLAGS+= -I$(PREFIX)/include $(DEFS) ++CFLAGS+= -I$(X11BASE)/include $(DEFS) @@ -27,2 +29,18 @@ |