Fix installation problems. Patches worked out by alistair Crooks.

3 files changed, 7 insertions, 7 deletions

diff --git a/editors/sam/patches/patch-aa b/editors/sam/patches/patch-aa
index b770f0cfa4b..6d66315dcb4 100644
--- a/editors/sam/patches/patch-aa
+++ b/editors/sam/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 1998/08/07 11:11:17 agc Exp $
+$NetBSD: patch-aa,v 1.3 2000/09/13 10:42:00 tron Exp $
 
 *** libXg/Makefile.orig	Fri Jul 28 14:02:17 1995
 --- libXg/Makefile	Fri Jul 21 15:03:43 1995
@@ -41,11 +41,11 @@ $NetBSD: patch-aa,v 1.2 1998/08/07 11:11:17 agc Exp $
 ! OS=-O2 -DBSDi
   
   #	add -Iincludedir for any include directories that need to be searched
-! INCS=-I../include -I/usr/X11R6/include
+! INCS=-I../include -I${X11BASE}/include
   
   #	set this if your X libraries are in different locations
   #	or if you need extra libraries to load with X11 applications
-! XLIBS=/usr/X11/lib/libXt.a /usr/X11/lib/libX11.a
+! XLIBS=-L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lXt -lX11
   
   #	add name of library orderer - use ":" if none
 ! RANLIB=ranlib
diff --git a/editors/sam/patches/patch-ac b/editors/sam/patches/patch-ac
index 69da3584efc..810c10dfccd 100644
--- a/editors/sam/patches/patch-ac
+++ b/editors/sam/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.2 1998/08/07 11:11:18 agc Exp $
+$NetBSD: patch-ac,v 1.3 2000/09/13 10:42:00 tron Exp $
 
 *** samterm/Makefile.orig	Fri Jul 28 14:09:32 1995
 --- samterm/Makefile	Fri Jul 21 15:30:09 1995
@@ -63,7 +63,7 @@ $NetBSD: patch-ac,v 1.2 1998/08/07 11:11:18 agc Exp $
 ! #      /usr/X11R6/lib/libICE.a \
 ! #      /usr/X11R6/lib/libX11.a
 ! 
-! XLIBS=-L/usr/X11R6/lib -lXt -lSM -lICE -lX11
+! XLIBS=-L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lXt -lSM -lICE -lX11
   
   CFLAGS=$(OS) $(INCS) -D_LIBXG_EXTENSION
   
diff --git a/editors/sam/patches/patch-af b/editors/sam/patches/patch-af
index acbc4d6978c..ad052d09a59 100644
--- a/editors/sam/patches/patch-af
+++ b/editors/sam/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.2 1998/08/07 11:11:19 agc Exp $
+$NetBSD: patch-af,v 1.3 2000/09/13 10:42:00 tron Exp $
 
 *** Makefile.orig	Fri Aug 11 15:55:41 1995
 --- Makefile	Fri Aug 11 16:08:35 1995
@@ -14,7 +14,7 @@ $NetBSD: patch-af,v 1.2 1998/08/07 11:11:19 agc Exp $
 + MAN3=add balloc bitblt cachechars event frame graphics rgbpix rune
 + MAN4=font keyboard utf
 + MAN6=bitmap regexp
-+ APP_DEFAULT_DIR=/usr/X11R6/lib/X11/app-defaults
++ APP_DEFAULT_DIR=${X11PREFIX}/lib/X11/app-defaults
 + AD=Sam
 + 
   all:	lXg lframe samdir samtermdir