X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=hints%2Fepix.sh;h=dcad3c5d476d7106710d12b9ce87a915c090d228;hb=8a647129b625da7b991d7050849bf1dc6684f30c;hp=9fd5c90e3f987ecac2eb3af168d9745d98d67ab4;hpb=16d20bd98cd29be76029ebf04027a7edd34d817b;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/hints/epix.sh b/hints/epix.sh
index 9fd5c90..dcad3c5 100644
--- a/hints/epix.sh
+++ b/hints/epix.sh
@@ -28,7 +28,7 @@ usrinc='/svr4/usr/include'
 strings='/svr4/usr/include/string.h'
 timeincl='/svr4/usr/include/sys/time.h '
 libc='/svr4/usr/lib/libc.a'
-libpth='/svr4/usr/lib /svr4/usr/lib/cmplrs/cc /usr/ccs/lib /svr4/lib /svr4/usr/ucblib'
+glibpth="/svr4/usr/lib /svr4/usr/lib/cmplrs/cc /usr/ccs/lib /svr4/lib /svr4/usr/ucblib $glibpth"
 osname='epix2'
 archname='epix2'
 d_suidsafe='define'	# "./Configure -d" can't figure this out easilly
@@ -43,9 +43,9 @@ d_flock='undef'
 # of libswanted excludes some libraries found there.  You may want to
 # prevent "ucb" from being removed from libswanted and see if perl will
 # build on your system.
-ldflags='-non_shared -systype svr4 -L/svr4/usr/lib -L/svr4/usr/lib/cmplrs/cc -L/usr/ccs/lib -L/svr4/usr/ucblib'
-ccflags='-systype svr4 -D__STDC__=0 -I/svr4/usr/include -I/svr4/usr/ucbinclude'
-cppflags='-D__STDC__=0 -I/svr4/usr/include -I/svr4/usr/ucbinclude'
+ldflags="$ldflags -non_shared -systype svr4 -L/svr4/usr/lib -L/svr4/usr/lib/cmplrs/cc -L/usr/ccs/lib -L/svr4/usr/ucblib"
+ccflags="$ccflags -systype svr4 -D__STDC__=0 -I/svr4/usr/include -I/svr4/usr/ucbinclude"
+cppflags="$ccflags -D__STDC__=0 -I/svr4/usr/include -I/svr4/usr/ucbinclude"
 
 # Don't use problematic libraries:
 
@@ -61,13 +61,6 @@ if [ -r /usr/ucblib/libucb.a ]; then	# If using BSD-compat. library:
 fi
 
 lddlflags="-G $ldflags"	# Probably needed for dynamic loading
+# We _do_ want the -L paths in ldflags, but we don't want the -non_shared.
+lddlflags=`echo $lddlflags | sed 's/-non_shared//'`
 
-cat <<'EOM' >&4
-
-If you wish to use dynamic linking, you must use 
-	LD_LIBRARY_PATH=`pwd`; export LD_LIBRARY_PATH
-or
-	setenv LD_LIBRARY_PATH `pwd`
-before running make.
-
-EOM