diff options
| author | Nicholas Clark <nick@ccl4.org> | 2009-09-12 15:56:51 +0100 |
|---|---|---|
| committer | Nicholas Clark <nick@ccl4.org> | 2009-09-12 15:57:59 +0100 |
| commit | 403f501d5b37ebf0340212b1a7f7c01855cd7b95 (patch) | |
| tree | 25e4aeac710091a6b8a8c95685db9a7255ed6d7b /win32/makefile.mk | |
| parent | 4527a2238fcb956920c7d18b8aa95a3ff49f0fcb (diff) | |
| download | perl-403f501d5b37ebf0340212b1a7f7c01855cd7b95.tar.gz | |
Move Cwd from lib to ext.
Obviously, it's going to take a bit more work to piece the PathTools
distribution back together.
Diffstat (limited to 'win32/makefile.mk')
| -rw-r--r-- | win32/makefile.mk | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/win32/makefile.mk b/win32/makefile.mk index 6c5b4db009..c4391325e4 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -1021,6 +1021,8 @@ ODBCCP32_DLL = $(SystemRoot)\system32\odbccp32.dll ODBCCP32_DLL = $(windir)\system\odbccp32.dll .ENDIF +ICWD = -I..\ext\Cwd + # # Top targets # @@ -1284,7 +1286,7 @@ $(MINIMOD) : $(MINIPERL) ..\minimod.pl ..\x2p\walk$(o) : ..\x2p\walk.c $(CC) -I..\x2p $(CFLAGS) $(OBJOUT_FLAG)$@ -c ..\x2p\walk.c -$(X2P) : $(MINIPERL) $(X2P_OBJ) +$(X2P) : $(MINIPERL) $(X2P_OBJ) Extensions $(MINIPERL) ..\x2p\find2perl.PL $(MINIPERL) ..\x2p\s2p.PL .IF "$(CCTYPE)" == "BORLAND" @@ -1378,10 +1380,10 @@ $(EXTDIR)\DynaLoader\dl_win32.xs: dl_win32.xs copy dl_win32.xs $(EXTDIR)\DynaLoader\dl_win32.xs MakePPPort: $(MINIPERL) $(CONFIGPM) Extensions_nonxs - $(MINIPERL) -I..\lib ..\mkppport + $(MINIPERL) -I..\lib $(ICWD) ..\mkppport MakePPPort_clean: - -if exist $(MINIPERL) $(MINIPERL) -I..\lib ..\mkppport --clean + -if exist $(MINIPERL) $(MINIPERL) -I..\lib $(ICWD) ..\mkppport --clean #------------------------------------------------------------------------------- # The rule for $(DYNALOADER).c makes DynaLoader.pm, and that is needed for @@ -1462,10 +1464,10 @@ utils: $(PERLEXE) $(X2P) copy ..\README.win32 ..\pod\perlwin32.pod copy ..\pod\perl5110delta.pod ..\pod\perldelta.pod cd ..\pod && $(MAKE) -f ..\win32\pod.mak converters - cd ..\lib && $(PERLEXE) lib_pm.PL + cd ..\lib && $(PERLEXE) $(ICWD) lib_pm.PL $(PERLEXE) $(PL2BAT) $(UTILS) - $(PERLEXE) ..\autodoc.pl .. - $(PERLEXE) ..\pod\perlmodlib.pl -q + $(PERLEXE) $(ICWD) ..\autodoc.pl .. + $(PERLEXE) $(ICWD) ..\pod\perlmodlib.pl -q ..\pod\perltoc.pod: $(PERLEXE) Extensions Extensions_nonxs $(PERLEXE) ..\pod\buildtoc --build-toc -q |