The Samba-Bugzilla – Attachment 3310 Details for
Bug 4081
Build system: Not building outside /source
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Proposed version of "config_mk.pm"
config_mk.pm.diff (text/plain), 1.84 KB, created by
Matthias Dieter Wallnöfer
on 2008-05-23 15:38:48 UTC
(
hide
)
Description:
Proposed version of "config_mk.pm"
Filename:
MIME Type:
Creator:
Matthias Dieter Wallnöfer
Created:
2008-05-23 15:38:48 UTC
Size:
1.84 KB
patch
obsolete
>diff --git a/source/build/smb_build/config_mk.pm b/source/build/smb_build/config_mk.pm >index 652a52f..4abfcbe 100644 >--- a/source/build/smb_build/config_mk.pm >+++ b/source/build/smb_build/config_mk.pm >@@ -102,43 +102,33 @@ sub _read_config_file($$$) > my $cwd = getcwd; > chomp $cwd; > >- if ($srcdir ne $builddir) { >- # Push the builddir path on the front, so we prefer builddir >- # to srcdir when the file exists in both. >- @dirlist = ($builddir, $srcdir); >- } else { >- @dirlist = ($srcdir); >- } >- >- foreach my $d (@dirlist) { >- my @lines; >- my $basedir; >+ my @lines; >+ my $basedir; > >- chdir $cwd; >- chdir $d; >+ chdir $cwd; >+ chdir $srcdir; > >- # We need to catch the exception from open in the case where >- # the filename is actually a shell pipeline. Why is this >- # different to opening a regular file? Because this is perl! >- eval { >- open(CONFIG_MK, "./$filename"); >- @lines = <CONFIG_MK>; >- close(CONFIG_MK); >- }; >+ # We need to catch the exception from open in the case where >+ # the filename is actually a shell pipeline. Why is this >+ # different to opening a regular file? Because this is perl! >+ eval { >+ open(CONFIG_MK, "./$filename"); >+ @lines = <CONFIG_MK>; >+ close(CONFIG_MK); >+ }; > >- chdir $cwd; >- next unless (@lines); >+ chdir $cwd; >+ next unless (@lines); > >- # I blame abartlett for this crazy hack -- jpeach >- if ($filename =~ /\|$/) { >- $basedir = $builddir; >- } else { >- $basedir = dirname($filename); >- push(@parsed_files, $filename); >- } >- $basedir =~ s!^($builddir|$srcdir)[/]!!; >- return ($filename, $basedir, @lines); >+ # I blame abartlett for this crazy hack -- jpeach >+ if ($filename =~ /\|$/) { >+ $basedir = $builddir; >+ } else { >+ $basedir = dirname($filename); >+ push(@parsed_files, $filename); > } >+ $basedir =~ s!^($builddir|$srcdir)[/]!!; >+ return ($filename, $basedir, @lines); > > chdir $cwd; > return;
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Actions:
View
Attachments on
bug 4081
:
2127
|
3305
|
3306
|
3307
|
3308
|
3309
|
3310
|
3311
|
3579