From: Nicholas Clark <nick@ccl4.org>
Date: Sat, 19 Sep 2009 16:15:18 +0000 (+0100)
Subject: lib/unicore/mktables needs to get File::Spec from ext/Cwd/lib
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=f54fcafc498511d9a430cf4ef0aca22ac67b9575;p=p5sagit%2Fp5-mst-13.2.git

lib/unicore/mktables needs to get File::Spec from ext/Cwd/lib

It was only parallel make order roulette that it was working on my machine.
VMS doesn't have this problem, as it's invoking mktables from the top level,
using its -C option to change directory, and VMS's $(MINIPERL) has an -I option
for [.ext.Cwd.lib]

Maybe all platforms should swap to using the -C approach.
---

diff --git a/Makefile.SH b/Makefile.SH
index b29542a..deb5444 100644
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -970,7 +970,7 @@ x2p/s2p: miniperl$(EXE_EXT) $(CONFIGPM) $(dynamic_ext) x2p/s2p.PL
 unidatafiles $(unidatafiles): uni.data
 
 uni.data: miniperl$(EXE_EXT) $(CONFIGPM) lib/unicore/mktables $(nonxs_ext)
-	cd lib/unicore && $(LDLIBPTH) $(RUN) ../../miniperl$(EXE_EXT) -I../../lib mktables -w
+	cd lib/unicore && $(LDLIBPTH) $(RUN) ../../miniperl$(EXE_EXT) -I../../lib -I../../ext/Cwd/lib mktables -w
 	touch uni.data
 
 # perl$(EXE_EXT) and ext because buildtoc uses Text::Wrap uses re
diff --git a/win32/Makefile b/win32/Makefile
index b1d1418..5c53cb8 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -1234,7 +1234,7 @@ inst_lib : $(CONFIGPM)
 
 $(UNIDATAFILES) : $(MINIPERL) $(CONFIGPM) ..\lib\unicore\mktables Extensions_nonxs
 	cd ..\lib\unicore && \
-	..\$(MINIPERL) -I.. mktables -check $@ $(FIRSTUNIFILE)
+	..\$(MINIPERL) -I.. -I..\..\ext\Cwd\lib mktables -check $@ $(FIRSTUNIFILE)
 
 minitest : $(MINIPERL) $(GLOBEXE) $(CONFIGPM) utils $(UNIDATAFILES)
 	$(XCOPY) $(MINIPERL) ..\t\$(NULL)
diff --git a/win32/makefile.mk b/win32/makefile.mk
index eb55f9a..faf080a 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -1563,7 +1563,7 @@ inst_lib : $(CONFIGPM)
 
 $(UNIDATAFILES) .UPDATEALL : $(MINIPERL) $(CONFIGPM) ..\lib\unicore\mktables Extensions_nonxs
 	cd ..\lib\unicore && \
-	..\$(MINIPERL) -I.. mktables
+	..\$(MINIPERL) -I.. -I..\..\ext\Cwd\lib mktables
 
 minitest : $(MINIPERL) $(GLOBEXE) $(CONFIGPM) $(UNIDATAFILES) utils
 	$(XCOPY) $(MINIPERL) ..\t\$(NULL)