[svn:dbi] rev 368 - dbi/trunk/lib/DBI

[timbo]

Author: timbo
Date: Sat Jun 26 13:55:25 2004
New Revision: 368

Modified:
   dbi/trunk/lib/DBI/DBD.pm
Log:
Fixes for make -j4 and recent ExtUtils::MakeMaker


Modified: dbi/trunk/lib/DBI/DBD.pm
==============================================================================
--- dbi/trunk/lib/DBI/DBD.pm    (original)
+++ dbi/trunk/lib/DBI/DBD.pm    Sat Jun 26 13:55:25 2004
@@ -3749,24 +3749,20 @@
 sub dbd_postamble {
     my $self = shift;
     _inst_checks();
-    my $dbidir = dbd_dbi_dir();
-    my $xstdir = dbd_dbi_arch_dir();
-    my $xstfile= '$(DBI_INSTARCH_DIR)/Driver.xst';
+    my $dbi_instarch_dir = ($is_dbi) ? "." : dbd_dbi_arch_dir();
+    my $dbi_driver_xst= '$(DBI_INSTARCH_DIR)/Driver.xst';
     my $xstf_h = '$(DBI_INSTARCH_DIR)/Driver_xst.h';
-    my $QQ = ( $Config{make} eq 'dmake') ? '"' : '';
     if ($^O eq 'VMS') {
-       $dbidir = vmsify($dbidir.'/');
-       $xstdir = vmsify($xstdir.'/') unless $is_dbi;
-       $xstfile= '$(DBI_INSTARCH_DIR)Driver.xst';
+       $dbi_instarch_dir = vmsify($dbi_instarch_dir.'/') unless $is_dbi;
+       $dbi_driver_xst= '$(DBI_INSTARCH_DIR)Driver.xst';
        $xstf_h = '$(DBI_INSTARCH_DIR)Driver_xst.h';
     }
 
     # we must be careful of quotes, expecially for Win32 here.
-    '
+    return '
 # --- This section was generated by DBI::DBD::dbd_postamble()
-DBI_INST_DIR='.$dbidir.'
-DBI_INSTARCH_DIR='.$xstdir.'
-DBI_DRIVER_XST='.$xstfile.'
+DBI_INSTARCH_DIR='.$dbi_instarch_dir.'
+DBI_DRIVER_XST='.$dbi_driver_xst.'
 
 # The main dependancy (technically correct but probably not used)
 $(BASEEXT).c: $(BASEEXT).xsi
@@ -3777,13 +3773,6 @@
 $(BASEEXT).xsi: $(DBI_DRIVER_XST) '.$xstf_h.'
        $(PERL) -p -e "s/~DRIVER~/$(BASEEXT)/g" $(DBI_DRIVER_XST) > $(BASEEXT).xsi
 
-# these two keep make -j4 working
-'.$QQ.'$(DBI_DRIVER_XST)'.$QQ.' :: pm_to_blib
-       $(NOECHO) $(NOOP)
-
-'.$QQ.$xstf_h.$QQ.' :: pm_to_blib
-       $(NOECHO) $(NOOP)
-
 # ---
 ';
 }