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/golddig | |
| 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/golddig')
| -rw-r--r-- | games/golddig/Makefile | 6 | ||||
| -rw-r--r-- | games/golddig/patches/patch-aa | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/games/golddig/Makefile b/games/golddig/Makefile index ebd0babf452..887683e9628 100644 --- a/games/golddig/Makefile +++ b/games/golddig/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 1998/07/26 22:13:16 frueauf Exp $ +# $NetBSD: Makefile,v 1.2 1998/08/27 14:06:08 garbled Exp $ # DISTNAME= golddig2 @@ -14,7 +14,3 @@ post-extract: ${RM} ${WRKSRC}/golddig ${WRKSRC}/makelev ${WRKSRC}/*.o .include "../../mk/bsd.pkg.mk" -.if (${OBJECT_FMT} == "ELF") -RPATH= -Wl,-rpath,${PREFIX}/lib -.endif -MAKE_ENV+= RPATH=${RPATH} diff --git a/games/golddig/patches/patch-aa b/games/golddig/patches/patch-aa index ee73978382b..da315166d99 100644 --- a/games/golddig/patches/patch-aa +++ b/games/golddig/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.2 1998/08/07 10:40:41 agc Exp $ +$NetBSD: patch-aa,v 1.3 1998/08/27 14:06:09 garbled Exp $ --- Makefile.orig Tue Feb 8 21:11:37 1994 +++ Makefile Sun Jul 26 07:39:28 1998 @@ -17,11 +17,11 @@ $NetBSD: patch-aa,v 1.2 1998/08/07 10:40:41 agc Exp $ @@ -30,6 +30,6 @@ #CFLAGS = -O -CFLAGS = -O2 -W -Wreturn-type -Wunused -finline-functions -D__USE_BSD_SIGNAL -+CFLAGS = -O2 -W -Wreturn-type -Wunused -finline-functions -D__USE_BSD_SIGNAL -I$(PREFIX)/include ++CFLAGS = -O2 -W -Wreturn-type -Wunused -finline-functions -D__USE_BSD_SIGNAL -I$(X11BASE)/include #CFLAGS = -g #LDFLAGS = -L /usr/X11/lib -lbsd -s -LDFLAGS = -L /usr/X11/lib -s -+LDFLAGS = $(RPATH) -L$(PREFIX)/lib ++LDFLAGS = -Wl,-R$(X11BASE)/lib -L$(X11BASE)/lib @@ -38,13 +38,12 @@ install: all |