diff options
| author | Nicholas Clark <nick@ccl4.org> | 2011-07-16 21:51:11 +0100 |
|---|---|---|
| committer | Nicholas Clark <nick@ccl4.org> | 2011-07-24 10:30:17 +0200 |
| commit | 080c37298617406e02876f5945650ccf10840f28 (patch) | |
| tree | 200388466acde33fc3dd5a351b862dcb723e2ec3 /win32 | |
| parent | 5097d0e7442cf91c815bc77f427ba824e9e79876 (diff) | |
| download | perl-080c37298617406e02876f5945650ccf10840f28.tar.gz | |
Add an option TARG_DIR to makedef.pl, giving the path to files to read & write.
Change the Makefiles for Win32, WinCE and NetWare to pass in TARG_DIR of ..\
Previously ..\ was hardcoded for PLATFORM=win32, wince or netware. Making it a
parameter allows portable testing of makedef.pl.
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile | 2 | ||||
| -rw-r--r-- | win32/Makefile.ce | 2 | ||||
| -rw-r--r-- | win32/makefile.mk | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/win32/Makefile b/win32/Makefile index 1c9307a288..1d680c0bab 100644 --- a/win32/Makefile +++ b/win32/Makefile @@ -902,7 +902,7 @@ $(X2P_OBJ) : $(CORE_H) perldll.def : $(MINIPERL) $(CONFIGPM) ..\global.sym ..\makedef.pl create_perllibst_h.pl $(MINIPERL) -I..\lib create_perllibst_h.pl $(MINIPERL) -I..\lib -w ..\makedef.pl PLATFORM=win32 $(OPTIMIZE) $(DEFINES) $(BUILDOPT) \ - CCTYPE=$(CCTYPE) > perldll.def + CCTYPE=$(CCTYPE) TARG_DIR=..\ > perldll.def $(PERLDLL): perldll.def $(PERLDLL_OBJ) $(PERLDLL_RES) Extensions_static $(LINK32) -dll -def:perldll.def -base:0x28000000 -out:$@ @Extensions_static @<< diff --git a/win32/Makefile.ce b/win32/Makefile.ce index 7209845233..b1bf152611 100644 --- a/win32/Makefile.ce +++ b/win32/Makefile.ce @@ -848,7 +848,7 @@ $(DLLDIR)\perllib$(o) : perllib.c .\perlhost.h .\vdir.h .\vmem.h perldll.def : $(HPERL) $(CONFIGPM) ..\global.sym ..\makedef.pl create_perllibst_h.pl $(HPERL) -MCross -I..\lib create_perllibst_h.pl $(HPERL) -w ..\makedef.pl PLATFORM=wince $(OPTIMIZE) $(DEFINES) $(BUILDOPT) \ - CCTYPE=$(CCTYPE) -DPERL_DLL=$(PERLDLL) > perldll.def + CCTYPE=$(CCTYPE) -DPERL_DLL=$(PERLDLL) TARG_DIR=..\ > perldll.def $(PERLDLL) : $(DLLDIR) perldll.def $(XDLLOBJS) $(PERLDLL_RES) $(LINK32) -dll -def:perldll.def -out:$@ \ diff --git a/win32/makefile.mk b/win32/makefile.mk index 93280e9e29..ec952a4dd8 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -1206,7 +1206,7 @@ $(X2P_OBJ) : $(CORE_H) perldll.def : $(MINIPERL) $(CONFIGPM) ..\global.sym ..\makedef.pl create_perllibst_h.pl $(MINIPERL) -I..\lib create_perllibst_h.pl $(MINIPERL) -I..\lib -w ..\makedef.pl PLATFORM=win32 $(OPTIMIZE) $(DEFINES) \ - $(BUILDOPT) CCTYPE=$(CCTYPE) > perldll.def + $(BUILDOPT) CCTYPE=$(CCTYPE) TARG_DIR=..\ > perldll.def $(PERLDLL): perldll.def $(PERLDLL_OBJ) $(PERLDLL_RES) Extensions_static .IF "$(CCTYPE)" == "BORLAND" |