summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-06-25 16:51:37 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-06-25 16:51:37 +0200
commit6ba3cffb481506bf3dc8921fbf4586c4094ed767 (patch)
tree1657fe190091f953a8cd6492070cefb020ccab96 /source4
parent1dca64e26a1d79ec0311d340df1f07d9158fbbae (diff)
downloadsamba-6ba3cffb481506bf3dc8921fbf4586c4094ed767.tar.gz
samba-6ba3cffb481506bf3dc8921fbf4586c4094ed767.tar.bz2
samba-6ba3cffb481506bf3dc8921fbf4586c4094ed767.zip
Revert "Remove the dependency on $(abspath) in makefiles"
This reverts commit c85a3632623184cb97c2e8567ca77834e81070a4. (This used to be commit 1a771c664444ff43e141238f473273700b392aa7)
Diffstat (limited to 'source4')
-rwxr-xr-xsource4/heimdal_build/asn1_deps.pl3
-rwxr-xr-xsource4/heimdal_build/et_deps.pl3
2 files changed, 2 insertions, 4 deletions
diff --git a/source4/heimdal_build/asn1_deps.pl b/source4/heimdal_build/asn1_deps.pl
index 80334328fc..6121781760 100755
--- a/source4/heimdal_build/asn1_deps.pl
+++ b/source4/heimdal_build/asn1_deps.pl
@@ -6,7 +6,6 @@
# GPL
use File::Basename;
-use Cwd 'getcwd';
my $file = shift;
my $prefix = shift;
@@ -32,7 +31,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) " . getcwd() . "/\$(heimdalsrcdir)/$file $prefix $options\n\n";
+print "\t\@\$(heimdalbuildsrcdir)/asn1_compile_wrapper.sh \$(builddir) $dirname \$(ASN1C) \$(abspath \$(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 5deabe82b5..6a0485bb54 100755
--- a/source4/heimdal_build/et_deps.pl
+++ b/source4/heimdal_build/et_deps.pl
@@ -1,7 +1,6 @@
#!/usr/bin/perl
use File::Basename;
-use Cwd 'getcwd';
my $file = shift;
my $dirname = shift;
@@ -11,7 +10,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) " . getcwd() . "/\$(heimdalsrcdir)/$file $source\n\n";
+print "\t\@\$(heimdalbuildsrcdir)/et_compile_wrapper.sh \$(builddir) $dirname \$(ET_COMPILER) \$(abspath \$(heimdalsrcdir)/$file) $source\n\n";
print "clean:: \n";
print "\t\@rm -f $header $source\n\n";