Use workaround for $(abspath)

(This used to be commit 21b4d017a2cccdaa6ab4ed32409f19c612293fd0)

diff --git a/source4/build/make/templates.mk b/source4/build/make/templates.mk
index 41a7ccd0a57735de95dcbe36ffa2fa51381f95df..25bdde09b469a6eb7c53008a602c7a2551befc58 100644 (file)
--- a/source4/build/make/templates.mk
+++ b/source4/build/make/templates.mk
@@ -106,3 +106,6 @@ uninstallplugins::
        @-rm $$(DESTDIR)$$(modulesdir)/$(1)/$(2)
 
 endef
+
+# abspath for older makes
+abspath := $(shell cd $(1); pwd)

diff --git a/source4/heimdal_build/asn1_deps.pl b/source4/heimdal_build/asn1_deps.pl
index 612178176074143767e732f9c76082b87a7a14a9..6b7181c4dd337eee079cd7de9f6553f3a175d3a8 100755 (executable)
--- a/source4/heimdal_build/asn1_deps.pl
+++ b/source4/heimdal_build/asn1_deps.pl
@@ -31,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) \$(abspath \$(heimdalsrcdir)/$file) $prefix $options\n\n";
+print "\t\@\$(heimdalbuildsrcdir)/asn1_compile_wrapper.sh \$(builddir) $dirname \$(ASN1C) \$(call 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 6a0485bb54a56a9a7ee5d26c18599cb75f8c03bf..5032d471c79b8e3dd55b0c2e7cfe4214b2af79c7 100755 (executable)
--- a/source4/heimdal_build/et_deps.pl
+++ b/source4/heimdal_build/et_deps.pl
@@ -10,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) \$(abspath \$(heimdalsrcdir)/$file) $source\n\n";
+print "\t\@\$(heimdalbuildsrcdir)/et_compile_wrapper.sh \$(builddir) $dirname \$(ET_COMPILER) \$(call abspath,\$(heimdalsrcdir)/$file) $source\n\n";
 
 print "clean:: \n";
 print "\t\@rm -f $header $source\n\n";