summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
authorNicholas Clark <nick@ccl4.org>2009-09-19 11:53:11 +0100
committerNicholas Clark <nick@ccl4.org>2009-09-19 11:53:11 +0100
commit83f40c94048fdbb191199226697fba08ab108a75 (patch)
tree7274fcbb1a1797d3ba9bab4b68bea9adca7f3924 /win32
parent978463b2c6a3c34cabcf3e18bb7d2e41abf7f9ef (diff)
downloadperl-83f40c94048fdbb191199226697fba08ab108a75.tar.gz
Reuinte File::Spec with the rest of the PathTools distribution in ext.
It can't really be renamed from ext/Cwd to ext/PathTools, because Configure and Makefile.SH need to know the name of the shared object produced, and they infer this from the name of the directory. This concludes the migration of modules from lib to ext. Exporter and version remain in lib, but I don't think that there is any benefit in trying to move either of them.
Diffstat (limited to 'win32')
-rw-r--r--win32/Makefile4
-rw-r--r--win32/makefile.mk4
2 files changed, 4 insertions, 4 deletions
diff --git a/win32/Makefile b/win32/Makefile
index e3348f5c63..77ac9b2e82 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -650,7 +650,7 @@ DEL = del
#
# filenames given to xsubpp must have forward slashes (since it puts
# full pathnames in #line strings)
-XSUBPP = ..\$(MINIPERL) -I..\..\lib -I..\Cwd ..\$(EXTUTILSDIR)\xsubpp \
+XSUBPP = ..\$(MINIPERL) -I..\..\lib -I..\Cwd -I..\Cwd\lib ..\$(EXTUTILSDIR)\xsubpp \
-C++ -prototypes
MICROCORE_SRC = \
@@ -829,7 +829,7 @@ CFG_VARS = \
"LINK_FLAGS=$(LINK_FLAGS:"=\")" \
"optimize=$(OPTIMIZE:"=\")"
-ICWD = -I..\ext\Cwd
+ICWD = -I..\ext\Cwd -I..\ext\Cwd\lib
#
# Top targets
diff --git a/win32/makefile.mk b/win32/makefile.mk
index 1498ea0420..e683091819 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -811,7 +811,7 @@ NOOP = @rem
#
# filenames given to xsubpp must have forward slashes (since it puts
# full pathnames in #line strings)
-XSUBPP = ..\$(MINIPERL) -I..\..\lib -I..\Cwd ..\$(EXTUTILSDIR)\xsubpp \
+XSUBPP = ..\$(MINIPERL) -I..\..\lib -I..\Cwd -I..\Cwd\lib ..\$(EXTUTILSDIR)\xsubpp \
-C++ -prototypes
MICROCORE_SRC = \
@@ -1019,7 +1019,7 @@ ODBCCP32_DLL = $(SystemRoot)\system32\odbccp32.dll
ODBCCP32_DLL = $(windir)\system\odbccp32.dll
.ENDIF
-ICWD = -I..\ext\Cwd
+ICWD = -I..\ext\Cwd -I..\ext\Cwd\lib
#
# Top targets