summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2008-06-19 12:29:50 +0200
committerStefan Metzmacher <metze@samba.org>2008-06-19 14:22:57 +0200
commitd67e18ee373e519a35316f6159efbb2229cacffb (patch)
tree43165f76acfe73b635caf246b67cd9fecfceae94 /source4
parent809d82d16943bf59e6623bcc6ce5248999f6da07 (diff)
downloadsamba-d67e18ee373e519a35316f6159efbb2229cacffb.tar.gz
samba-d67e18ee373e519a35316f6159efbb2229cacffb.tar.bz2
samba-d67e18ee373e519a35316f6159efbb2229cacffb.zip
Remove the dependency on $(abspath) in makefiles
This is not around before GNU make 3.81, for me this fixes the build on GNU make 3.80 Signed-off-by: Stefan Metzmacher <metze@samba.org> (This used to be commit c85a3632623184cb97c2e8567ca77834e81070a4)
Diffstat (limited to 'source4')
-rwxr-xr-xsource4/heimdal_build/asn1_deps.pl3
-rwxr-xr-xsource4/heimdal_build/et_deps.pl3
2 files changed, 4 insertions, 2 deletions
diff --git a/source4/heimdal_build/asn1_deps.pl b/source4/heimdal_build/asn1_deps.pl
index 6121781760..80334328fc 100755
--- a/source4/heimdal_build/asn1_deps.pl
+++ b/source4/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/source4/heimdal_build/et_deps.pl b/source4/heimdal_build/et_deps.pl
index 6a0485bb54..5deabe82b5 100755
--- a/source4/heimdal_build/et_deps.pl
+++ b/source4/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";