From 2896fa84839e6dd520f152478fdf78c4e92832a2 Mon Sep 17 00:00:00 2001
From: garbled <garbled@pkgsrc.org>
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/imaze/Makefile         | 6 +-----
 games/imaze/patches/patch-aa | 8 ++++----
 2 files changed, 5 insertions(+), 9 deletions(-)

(limited to 'games/imaze')

diff --git a/games/imaze/Makefile b/games/imaze/Makefile
index 1424afb30ac..67bad1366fa 100644
--- a/games/imaze/Makefile
+++ b/games/imaze/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1998/08/20 15:16:55 tsarna Exp $
+# $NetBSD: Makefile,v 1.4 1998/08/27 14:06:08 garbled Exp $
 
 DISTNAME=		imaze1.3
 PKGNAME=		imaze-1.3
@@ -20,7 +20,3 @@ post-build:
 	cd ${WRKSRC} && /bin/pax -rf ${DISTDIR}/imaze-sounds.tar
 
 .include "../../mk/bsd.pkg.mk"
-.if (${OBJECT_FMT} == "ELF")
-RPATH=		-Wl,-rpath,${PREFIX}/lib
-.endif
-MAKE_ENV+=	RPATH=${RPATH}
diff --git a/games/imaze/patches/patch-aa b/games/imaze/patches/patch-aa
index 0a450a64a8a..8c64d7873f1 100644
--- a/games/imaze/patches/patch-aa
+++ b/games/imaze/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 1998/08/07 10:40:41 agc Exp $
+$NetBSD: patch-aa,v 1.4 1998/08/27 14:06:09 garbled Exp $
 
 --- source/Makefile.orig	Thu Feb 22 23:01:18 1996
 +++ source/Makefile	Fri Jul 31 00:43:52 1998
@@ -38,8 +38,8 @@ $NetBSD: patch-aa,v 1.3 1998/08/07 10:40:41 agc Exp $
  
 -MOTIFLIBS=-lXm -lXt -lX11
 -MOTIFINCLUDES=
-+MOTIFLIBS=-L$(PREFIX)/lib -lXm -lXt -lX11
-+MOTIFINCLUDES=-I$(PREFIX)/include
++MOTIFLIBS=-L$(X11BASE)/lib -lXm -lXt -lX11
++MOTIFINCLUDES=-I$(X11BASE)/include
  
  GRAFLIBS=$($(GRAF)LIBS)
  GRAFINCLUDES=$($(GRAF)INCLUDES)
@@ -48,7 +48,7 @@ $NetBSD: patch-aa,v 1.3 1998/08/07 10:40:41 agc Exp $
  GRAF=NONE
  
 -LDFLAGS=
-+LDFLAGS=$(RPATH)
++LDFLAGS= -Wl,-R$(X11BASE)/lib
  CFLAGS=$(GRAFINCLUDES) $(COPT) $(DEFINES) $(SYSDEFS)
  
  # bis hier Optionen eintragen
-- 
cgit v1.2.3