[win32] @INC construction on win32 cleaned up

[perl5.git] / win32 / config.bc

diff --git a/win32/config.bc b/win32/config.bc
index f0a0952..453c6fd 100644 (file)
--- a/win32/config.bc
+++ b/win32/config.bc
@@ -21,15 +21,15 @@ afs='false'
 alignbytes='8'
 aphostname=''
 ar='tlib /P128'
-archlib=''
-archlibexp=''
+archlib='~INST_TOP~~INST_VER~\lib\~archname~'
+archlibexp='~INST_TOP~~INST_VER~\lib\~archname~'
 archname='MSWin32'
 archobjs=''
 awk='awk'
 baserev='5.0'
 bash=''
-bin='~INST_TOP~\bin'
-binexp='~INST_TOP~\bin'
+bin='~INST_TOP~~INST_VER~\bin\~archname~'
+binexp='~INST_TOP~~INST_VER~\bin\~archname~'
 bison=''
 byacc='byacc'
 byteorder='1234'
@@ -64,7 +64,7 @@ csh='undef'
 d_Gconvert='gcvt((x),(n),(b))'
 d_access='define'
 d_alarm='undef'
-d_archlib='undef'
+d_archlib='define'
 d_attribut='undef'
 d_bcmp='undef'
 d_bcopy='undef'
@@ -367,14 +367,14 @@ i_varhdr='varargs.h'
 i_vfork='undef'
 incpath=''
 inews=''
-installarchlib='~INST_TOP~\lib\~archname~'
-installbin='~INST_TOP~\bin\~archname~'
-installman1dir='~INST_TOP~\man\man1'
-installman3dir='~INST_TOP~\man\man3'
-installprivlib='~INST_TOP~\lib'
-installscript='~INST_TOP~\bin'
-installsitearch='~INST_TOP~\..\site\~VERSION~\lib\~archname~'
-installsitelib='~INST_TOP~\..\site\~VERSION~\lib'
+installarchlib='~INST_TOP~~INST_VER~\lib\~archname~'
+installbin='~INST_TOP~~INST_VER~\bin\~archname~'
+installman1dir='~INST_TOP~~INST_VER~\man\man1'
+installman3dir='~INST_TOP~~INST_VER~\man\man3'
+installprivlib='~INST_TOP~~INST_VER~\lib'
+installscript='~INST_TOP~~INST_VER~\bin'
+installsitearch='~INST_TOP~\site~INST_VER~\lib\~archname~'
+installsitelib='~INST_TOP~\site~INST_VER~\lib'
 intsize='4'
 known_extensions='DB_File Fcntl GDBM_File NDBM_File ODBM_File Opcode POSIX SDBM_File Socket IO attrs Thread'
 ksh=''
@@ -410,11 +410,11 @@ make_set_make='#'
 mallocobj='malloc.o'
 mallocsrc='malloc.c'
 malloctype='void *'
-man1dir='~INST_TOP~\man\man1'
-man1direxp='~INST_TOP~\man\man1'
+man1dir='~INST_TOP~~INST_VER~\man\man1'
+man1direxp='~INST_TOP~~INST_VER~\man\man1'
 man1ext='1'
-man3dir='~INST_TOP~\man\man3'
-man3direxp='~INST_TOP~\man\man3'
+man3dir='~INST_TOP~~INST_VER~\man\man3'
+man3direxp='~INST_TOP~~INST_VER~\man\man3'
 man3ext='3'
 medium=''
 mips=''
@@ -450,7 +450,7 @@ patchlevel='2'
 path_sep=';'
 perl='perl'
 perladmin=''
-perlpath='~INST_TOP~\bin\~archname~\perl.exe'
+perlpath='~INST_TOP~~INST_VER~\bin\~archname~\perl.exe'
 pg=''
 phostname='hostname'
 pidtype='int'
@@ -459,8 +459,8 @@ pmake=''
 pr=''
 prefix='~INST_DRV~'
 prefixexp='~INST_DRV~'
-privlib='~INST_TOP~\lib'
-privlibexp='~INST_TOP~\lib'
+privlib='~INST_TOP~~INST_VER~\lib'
+privlibexp='~INST_TOP~~INST_VER~\lib'
 prototype='define'
 ptrsize='4'
 randbits='15'
@@ -469,8 +469,8 @@ rd_nodata='-1'
 rm='del'
 rmail=''
 runnm='true'
-scriptdir='~INST_TOP~\bin'
-scriptdirexp='~INST_TOP~\bin'
+scriptdir='~INST_TOP~~INST_VER~\bin'
+scriptdirexp='~INST_TOP~~INST_VER~\bin'
 sed='sed'
 selecttype='Perl_fd_set *'
 sendmail='blat'
@@ -485,10 +485,10 @@ sig_name='ZERO INT QUIT ILL FPE KILL SEGV PIPE ALRM TERM USR1 USR2 CHLD USR3 BRE
 sig_name_init='"ZERO", "INT", "QUIT", "ILL", "FPE", "KILL", "SEGV", "PIPE", "ALRM", "TERM", "USR1", "USR2", "CHLD", "USR3", "BREAK", "ABRT", "STOP", "CONT", "CLD", 0'
 sig_num='0, 2, 3, 4, 8, 9, 11, 13, 14, 15, 16, 17, 18, 20, 21, 22, 23, 25, 18, 0'
 signal_t='void'
-sitearch=''
-sitearchexp=''
-sitelib='~INST_TOP~\..\site\~VERSION~\lib'
-sitelibexp='~INST_TOP~\..\site\~VERSION~\lib'
+sitearch='~INST_TOP~\site~INST_VER~\lib\~archname~'
+sitearchexp='~INST_TOP~\site~INST_VER~\lib\~archname~'
+sitelib='~INST_TOP~\site~INST_VER~\lib'
+sitelibexp='~INST_TOP~\site~INST_VER~\lib'
 sizetype='size_t'
 sleep=''
 smail=''