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/battalion | |
| 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/battalion')
| -rw-r--r-- | games/battalion/Makefile | 7 | ||||
| -rw-r--r-- | games/battalion/patches/patch-aa | 6 |
2 files changed, 4 insertions, 9 deletions
diff --git a/games/battalion/Makefile b/games/battalion/Makefile index 8911c141089..95851d04de0 100644 --- a/games/battalion/Makefile +++ b/games/battalion/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 1998/08/23 20:30:51 frueauf Exp $ +# $NetBSD: Makefile,v 1.5 1998/08/27 14:06:07 garbled Exp $ # DISTNAME= battalion @@ -37,8 +37,3 @@ pre-clean: @${RM} -rf ${WRKDIR}/battalionSUN4 .include "../../mk/bsd.pkg.mk" - -.if (${OBJECT_FMT} == "ELF") -RPATH= -Wl,-rpath,${PREFIX}/lib -.endif -MAKE_ENV+= RPATH=${RPATH} diff --git a/games/battalion/patches/patch-aa b/games/battalion/patches/patch-aa index 7818dffa4e4..5265e35472b 100644 --- a/games/battalion/patches/patch-aa +++ b/games/battalion/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.2 1998/08/07 10:40:38 agc Exp $ +$NetBSD: patch-aa,v 1.3 1998/08/27 14:06:09 garbled Exp $ --- Makefile.orig Thu Jan 16 09:31:58 1997 +++ Makefile Sat Jul 25 09:22:54 1998 @@ -31,14 +31,14 @@ $NetBSD: patch-aa,v 1.2 1998/08/07 10:40:38 agc Exp $ # ------------------------------------------------------------ -CFLAGS = -O -I/usr/local/X11/include -I/usr/demo/SOUND/ -I./. - -+CFLAGS = -O $(DEFS) -I$(PREFIX)/include -I./. ++CFLAGS = -O $(DEFS) -I$(X11BASE)/include -I./. +DATADIR = $(PREFIX)/share/battalion/ +DEFS = -DDATADIR=\"$(DATADIR)\" @@ -99,3 +100,3 @@ # ------------------------------------------------------------ -LIBFLAGS = -+LIBFLAGS = $(RPATH) -L$(PREFIX)/lib -lcompat ++LIBFLAGS = -Wl,-R$(X11BASE)/lib -L$(X11BASE)/lib -lcompat @@ -117,2 +118,4 @@ $(CC) -o $(TARGET) $(OBJ) $(LIBFLAGS) $(GLIB) $(LIBS) $(AUDIOLIB) |