From 3fba00f440cd0883cd98c7c87ae9c7728f64376f Mon Sep 17 00:00:00 2001
From: garbled <garbled>
Date: Thu, 27 Aug 1998 14:06:07 +0000
Subject: 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.

---
 games/battalion/Makefile         | 7 +------
 games/battalion/patches/patch-aa | 6 +++---
 2 files changed, 4 insertions(+), 9 deletions(-)

(limited to 'games/battalion')

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)
-- 
cgit v1.2.3