svn commit: samba r15378 - in branches/SAMBA_4_0/source/script: .

jelmer at samba.org jelmer at samba.org
Mon May 1 15:45:27 GMT 2006


Author: jelmer
Date: 2006-05-01 15:45:26 +0000 (Mon, 01 May 2006)
New Revision: 15378

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15378

Log:
Fix installheader script. Alexander, this will break installation of headers 
for srcdir != builddir

Modified:
   branches/SAMBA_4_0/source/script/installheader.pl


Changeset:
Modified: branches/SAMBA_4_0/source/script/installheader.pl
===================================================================
--- branches/SAMBA_4_0/source/script/installheader.pl	2006-05-01 14:33:48 UTC (rev 15377)
+++ branches/SAMBA_4_0/source/script/installheader.pl	2006-05-01 15:45:26 UTC (rev 15378)
@@ -2,18 +2,16 @@
 # Copyright (C) 2006 Jelmer Vernooij
 use strict;
 use File::Basename;
-use Cwd 'abs_path';
 
 my $includedir = shift;
-my $builddir = abs_path($ENV{samba_builddir});
-my $srcdir = abs_path($ENV{samba_srcdir});
 
+
 sub read_headermap($)
 {
 	my ($fn) = @_;
 	my %map = ();
 	my $ln = 0;
-	open(MAP, "<$fn");
+	open(MAP, "<headermap.txt");
 	while(<MAP>) {
 		$ln++;
 		s/#.*$//g;
@@ -30,19 +28,14 @@
 	return %map;
 }
 
-my %map = read_headermap("$srcdir/headermap.txt");
+my %map = read_headermap("headermap.txt");
 
 sub findmap($)
 {
 	$_ = shift;
 	s/^\.\///g;
-	s/$builddir\///g;
-	s/$srcdir\///g;
 
 	if (! -f $_ && -f "lib/$_") { $_ = "lib/$_"; }
-	if ($srcdir !~ $builddir) {
-	 if (! -f "$srcdir/$_" && -f "$srcdir/lib/$_") { $_ = "lib/$_"; }
-	}
 	
 	return $map{$_};
 }
@@ -62,7 +55,7 @@
 
 	my $lineno = 0;
 
-	open(IN, "<$src") || open(IN, "<$srcdir/$src");
+	open(IN, "<$src");
 	open(OUT, ">$dst");
 
 	while (<IN>) {



More information about the samba-cvs mailing list