summaryrefslogtreecommitdiff
path: root/misc/xpns
diff options
context:
space:
mode:
authorSteve Price <steve@FreeBSD.org>1998-10-04 22:36:34 +0000
committerSteve Price <steve@FreeBSD.org>1998-10-04 22:36:34 +0000
commit0c9b213b58b5bec1bed992b8071c68dc30d0d954 (patch)
treea2b1beb093f816e24e63c78a367033dce2b0f972 /misc/xpns
parentEscape the '@' character so perl in -current doesn't choke. (diff)
Fix build for ELF.
Notes
Notes: svn path=/head/; revision=13636
Diffstat (limited to 'misc/xpns')
-rw-r--r--misc/xpns/files/patch-aa15
1 files changed, 9 insertions, 6 deletions
diff --git a/misc/xpns/files/patch-aa b/misc/xpns/files/patch-aa
index aa8b025d4e28..2b045ef13c61 100644
--- a/misc/xpns/files/patch-aa
+++ b/misc/xpns/files/patch-aa
@@ -1,6 +1,6 @@
--- makefile.orig Wed Jul 14 06:05:14 1993
-+++ makefile Tue Apr 8 11:49:27 1997
-@@ -7,19 +7,19 @@
++++ makefile Sun Oct 4 14:19:13 1998
+@@ -7,19 +7,21 @@
#I = -I/usr/include
#------------------------------------------
@@ -9,12 +9,15 @@
#------------------------------------------
-O = -O
-I = -I/usr/local/X11R5/include
-+O = -O2 -m486
-+I = -I/usr/X11R6/include
-
+-
-L = -L/usr/local/X11R5/lib -lXaw -lXmu -lXt -lXext -lX11 -lm
-+L = -L/usr/X11R6/lib -lXaw -lXmu -lXt -lXext -lX11 -lm
++O = -O2 -m486
++I = -I$(X11BASE)/include
++L = -L$(X11BASE)/lib -lXaw -lXmu -lXt -lXext -lX11 -lm
++.if $(PORTOBJFORMAT) == "elf"
++L +=-Wl,-rpath,$(X11BASE)/lib
++.endif
#------------------------------------------
# COMPILER UND LINKER