pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/ocaml Set SHELL explicitly on the install make in...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/d2748a8076b7
branches:  trunk
changeset: 533730:d2748a8076b7
user:      dmcmahill <dmcmahill%pkgsrc.org@localhost>
date:      Wed Sep 26 03:10:54 2007 +0000

description:
Set SHELL explicitly on the install make invocation when on solaris.
By using /bin/ksh (${SH}), we get the desired value of $CWD in on of the
scripts called by the programs install procedure.

Fixes installation under solaris, other platforms unaffected.

diffstat:

 lang/ocaml/Makefile |  12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diffs (25 lines):

diff -r f2878b1947a8 -r d2748a8076b7 lang/ocaml/Makefile
--- a/lang/ocaml/Makefile       Tue Sep 25 21:00:16 2007 +0000
+++ b/lang/ocaml/Makefile       Wed Sep 26 03:10:54 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2007/09/14 15:34:09 adam Exp $
+# $NetBSD: Makefile,v 1.55 2007/09/26 03:10:54 dmcmahill Exp $
 
 .include "Makefile.common"
 
@@ -33,5 +33,15 @@
 # Common ocaml files.
 PLIST_SRC+=    ${PKGDIR}/PLIST
 
+# This is needed because ${WRKSRC}/build/partial-install.sh uses
+# $PWD as part of its script.  However, with /bin/sh on SunOS
+# (cd work/foo-1.0 && echo $PWD) will show that the value of PWD is
+# set before the cd takes place and is then passed down.  So the end
+# result is when ./build/partial-install.sh is called, PWD is set
+# to /usr/pkgsrc/devel/ocaml instead of ${WRKSRC}.  /bin/ksh, which
+# is what ${SH} is on SunOS, doesn't exhibit this behaviour.
+.if ${OPSYS} == "SunOS"
+INSTALL_MAKE_FLAGS+=   SHELL=${SH}
+.endif
 
 .include "../../mk/bsd.pkg.mk"



Home | Main Index | Thread Index | Old Index