diff options
| -rw-r--r-- | NetWare/Makefile | 4 | ||||
| -rw-r--r-- | makedef.pl | 9 | ||||
| -rw-r--r-- | win32/Makefile | 2 | ||||
| -rw-r--r-- | win32/Makefile.ce | 2 | ||||
| -rw-r--r-- | win32/makefile.mk | 2 |
5 files changed, 11 insertions, 8 deletions
diff --git a/NetWare/Makefile b/NetWare/Makefile index 22d8e5fe55..4c14412d7e 100644 --- a/NetWare/Makefile +++ b/NetWare/Makefile @@ -1063,10 +1063,10 @@ $(PERLIMPLIB): perllib.imp perllib.imp : $(MINIPERL) $(CONFIGPM) ..\global.sym ..\makedef.pl # $(MINIPERL) -w ..\makedef.pl PLATFORM=netware FILETYPE=def $(ADD_BUILDOPT) \ -# CCTYPE=$(CCTYPE) > perllib.def +# CCTYPE=$(CCTYPE) TARG_DIR=..\ > perllib.def @echo (Perl) > perl.imp $(MINIPERL) -w ..\makedef.pl PLATFORM=netware FILETYPE=imp $(BS_CFLAGS) $(DEFINES) $(ADD_BUILDOPT) \ - CCTYPE=$(CCTYPE) >> perl.imp + CCTYPE=$(CCTYPE) TARG_DIR=..\ >> perl.imp copy perl.imp $(COREDIR) $(DLL_OBJ) : $(DYNALOADER).c $(CORE_H) $(EXTDIR)\DynaLoader\dlutils.c diff --git a/makedef.pl b/makedef.pl index 0f47ffb846..c69589d124 100644 --- a/makedef.pl +++ b/makedef.pl @@ -36,7 +36,9 @@ BEGIN { unshift @INC, "lib" } use Config; use strict; -use vars qw($PLATFORM $CCTYPE $FILETYPE $CONFIG_ARGS $ARCHNAME $PATCHLEVEL); +use vars qw($PLATFORM $CCTYPE $FILETYPE $CONFIG_ARGS $ARCHNAME $PATCHLEVEL $TARG_DIR); + +$TARG_DIR = ''; my (%define, %ordinal); @@ -56,6 +58,7 @@ while (@ARGV) { if ($PLATFORM eq 'netware') { $FILETYPE = $1 if ($flag =~ /^FILETYPE=(\w+)$/); } + $TARG_DIR = $1 if $flag =~ /^TARG_DIR=(.+)$/; } my @PLATFORM = qw(aix win32 wince os2 netware vms); @@ -112,9 +115,9 @@ if ($PLATFORM eq 'aix') { } elsif ($PLATFORM =~ /^win(?:32|ce)$/ || $PLATFORM eq 'netware') { $CCTYPE = "MSVC" unless defined $CCTYPE; - foreach ($intrpvar_h, $perlvars_h, $global_sym, $globvar_sym, $perlio_sym + foreach ($intrpvar_h, $perlvars_h, $global_sym, $globvar_sym, $perlio_sym, $config_sh) { - s!^!..\\!; + s!^!$TARG_DIR!; } } 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" |