[PATCH] Remove the dependency on $(abspath) in makefiles
Volker Lendecke
vl at samba.org
Thu Jun 19 10:29:50 GMT 2008
This is not around before GNU make 3.81, for me this fixes the build
on GNU make 3.80
---
source/heimdal_build/asn1_deps.pl | 3 ++-
source/heimdal_build/et_deps.pl | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/source/heimdal_build/asn1_deps.pl b/source/heimdal_build/asn1_deps.pl
index 6121781..8033432 100755
--- a/source/heimdal_build/asn1_deps.pl
+++ b/source/heimdal_build/asn1_deps.pl
@@ -6,6 +6,7 @@
# GPL
use File::Basename;
+use Cwd 'getcwd';
my $file = shift;
my $prefix = shift;
@@ -31,7 +32,7 @@ my $header = "$dirname/$prefix.h";
print "$header: \$(heimdalsrcdir)/$file \$(ASN1C)\n";
print "\t\@echo \"Compiling ASN1 file \$(heimdalsrcdir)/$file\"\n";
-print "\t\@\$(heimdalbuildsrcdir)/asn1_compile_wrapper.sh \$(builddir) $dirname \$(ASN1C) \$(abspath \$(heimdalsrcdir)/$file) $prefix $options\n\n";
+print "\t\@\$(heimdalbuildsrcdir)/asn1_compile_wrapper.sh \$(builddir) $dirname \$(ASN1C) " . getcwd() . "/\$(heimdalsrcdir)/$file $prefix $options\n\n";
open(IN,"heimdal/$file") or die("Can't open heimdal/$file: $!");
my @lines = <IN>;
diff --git a/source/heimdal_build/et_deps.pl b/source/heimdal_build/et_deps.pl
index 6a0485b..5deabe8 100755
--- a/source/heimdal_build/et_deps.pl
+++ b/source/heimdal_build/et_deps.pl
@@ -1,6 +1,7 @@
#!/usr/bin/perl
use File::Basename;
+use Cwd 'getcwd';
my $file = shift;
my $dirname = shift;
@@ -10,7 +11,7 @@ my $header = "$dirname/$basename"; $header =~ s/\.et$/.h/;
my $source = "$dirname/$basename"; $source =~ s/\.et$/.c/;
print "$header $source: \$(heimdalsrcdir)/$file \$(ET_COMPILER)\n";
print "\t\@echo \"Compiling error table $file\"\n";
-print "\t\@\$(heimdalbuildsrcdir)/et_compile_wrapper.sh \$(builddir) $dirname \$(ET_COMPILER) \$(abspath \$(heimdalsrcdir)/$file) $source\n\n";
+print "\t\@\$(heimdalbuildsrcdir)/et_compile_wrapper.sh \$(builddir) $dirname \$(ET_COMPILER) " . getcwd() . "/\$(heimdalsrcdir)/$file $source\n\n";
print "clean:: \n";
print "\t\@rm -f $header $source\n\n";
--
1.5.5
More information about the samba-technical
mailing list