From cc91b7759be8b686be6a3fa5616ef788b2c0cb91 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/gemdropx/Makefile         | 6 +-----
 games/gemdropx/patches/patch-ab | 6 +++---
 2 files changed, 4 insertions(+), 8 deletions(-)

(limited to 'games/gemdropx')

diff --git a/games/gemdropx/Makefile b/games/gemdropx/Makefile
index e4d6e8d8cf5..9a317712224 100644
--- a/games/gemdropx/Makefile
+++ b/games/gemdropx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1998/08/20 15:16:55 tsarna Exp $
+# $NetBSD: Makefile,v 1.3 1998/08/27 14:06:08 garbled Exp $
 #
 
 DISTNAME=	gemdropx
@@ -15,7 +15,3 @@ WRKSRC=		${WRKDIR}/gemdropx
 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/gemdropx/patches/patch-ab b/games/gemdropx/patches/patch-ab
index 8a5e2662f15..64064fbab30 100644
--- a/games/gemdropx/patches/patch-ab
+++ b/games/gemdropx/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 1998/08/07 10:40:41 agc Exp $
+$NetBSD: patch-ab,v 1.3 1998/08/27 14:06:09 garbled Exp $
 
 --- makefile.orig	Fri Nov 21 23:56:59 1997
 +++ makefile	Sat Jul 25 06:50:05 1998
@@ -16,8 +16,8 @@ $NetBSD: patch-ab,v 1.2 1998/08/07 10:40:41 agc Exp $
 +GFX=$(PREFIX)/share/gemdropx/gfx
 +SOUNDS=$(PREFIX)/share/gemdropx/sounds
 +
-+XLIB= $(RPATH) -L$(PREFIX)/lib -lX11 -lm -lcompat
-+XINC= -I$(PREFIX)/include
++XLIB= -Wl,-R$(X11BASE)/lib -L$(X11BASE)/lib -lX11 -lm -lcompat
++XINC= -I$(X11BASE)/include
 +CFLAGS= $(XINC) -DSOUNDS=\"$(SOUNDS)\" -DGFX=\"$(GFX)\"
  
 @@ -29,11 +30,15 @@
-- 
cgit v1.2.3