From 1a771c664444ff43e141238f473273700b392aa7 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Wed, 25 Jun 2008 16:51:37 +0200 Subject: [PATCH] Revert "Remove the dependency on $(abspath) in makefiles" This reverts commit c85a3632623184cb97c2e8567ca77834e81070a4. --- source/heimdal_build/asn1_deps.pl | 3 +-- source/heimdal_build/et_deps.pl | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/source/heimdal_build/asn1_deps.pl b/source/heimdal_build/asn1_deps.pl index 80334328fc48..612178176074 100755 --- a/source/heimdal_build/asn1_deps.pl +++ b/source/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 = ; diff --git a/source/heimdal_build/et_deps.pl b/source/heimdal_build/et_deps.pl index 5deabe82b547..6a0485bb54a5 100755 --- a/source/heimdal_build/et_deps.pl +++ b/source/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"; -- 2.34.1