diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-06-25 17:12:19 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-06-25 17:12:19 +0200 |
| commit | 18ba7d76799d6a8a2a9f1ab2620649783a774653 (patch) | |
| tree | 106265c463c0d0bec7730f283c66561ae56e874c | |
| parent | 6ba3cffb481506bf3dc8921fbf4586c4094ed767 (diff) | |
| download | samba-18ba7d76799d6a8a2a9f1ab2620649783a774653.tar.gz samba-18ba7d76799d6a8a2a9f1ab2620649783a774653.tar.bz2 samba-18ba7d76799d6a8a2a9f1ab2620649783a774653.zip | |
Use workaround for $(abspath)
(This used to be commit 21b4d017a2cccdaa6ab4ed32409f19c612293fd0)
| -rw-r--r-- | source4/build/make/templates.mk | 3 | ||||
| -rwxr-xr-x | source4/heimdal_build/asn1_deps.pl | 2 | ||||
| -rwxr-xr-x | source4/heimdal_build/et_deps.pl | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/source4/build/make/templates.mk b/source4/build/make/templates.mk index 41a7ccd0a5..25bdde09b4 100644 --- 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 6121781760..6b7181c4dd 100755 --- 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 6a0485bb54..5032d471c7 100755 --- 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"; |