r15099: An attempt to fix BSD make portability issues. With these changes Samba 4...

(This used to be commit 71ea07e72d71b06166e0384950df83061a4677b8)

diff --git a/source4/heimdal_build/config.mk b/source4/heimdal_build/config.mk
index c66784224ab8dff0d133c6e101f2299d3ebb1051..591d15753f58275214443a2f05a395b240c74c4b 100644 (file)
--- a/source4/heimdal_build/config.mk
+++ b/source4/heimdal_build/config.mk
@@ -436,6 +436,9 @@ include perl_path_wrapper.sh et_deps.pl heimdal/lib/krb5/krb5_err.et|
 .hin.h:
        @cp $< $@
 
+heimdal/lib/roken/vis.h: heimdal/lib/roken/vis.hin
+heimdal/lib/roken/err.h: heimdal/lib/roken/err.hin
+
 $(patsubst heimdal/lib/des/%.h,heimdal/lib/des/hcrypto/%.h,$(wildcard heimdal/lib/des/*.h)): heimdal/lib/des/hcrypto
 
 heimdal/lib/des/hcrypto: 

diff --git a/source4/lib/registry/config.mk b/source4/lib/registry/config.mk
index 9cc8c93450fd0f6f181844c01f8a5f1ba015d5da..2693f7dde3e9530bcb34735aef2017325fd82f21 100644 (file)
--- a/source4/lib/registry/config.mk
+++ b/source4/lib/registry/config.mk
@@ -22,7 +22,7 @@ lib/registry/tdr_regf.h: lib/registry/tdr_regf.c
 lib/registry/tdr_regf.c: $(srcdir)/lib/registry/regf.idl
        @CPP="$(CPP)" $(PERL) $(srcdir)/pidl/pidl $(PIDL_ARGS) \
                --header --outputdir=lib/registry \
-               --tdr-parser -- $^
+               --tdr-parser -- $(srcdir)/lib/registry/regf.idl
 
 clean::
        @-rm -f lib/registry/regf.h lib/registry/tdr_regf*

diff --git a/source4/script/buildtree.pl b/source4/script/buildtree.pl
index 41cbb3ad765568f123ecb858023409ee68310ff1..be5170e7d1e9d34b4b161aa06dcbe8ed6aa862df 100644 (file)
--- a/source4/script/buildtree.pl
+++ b/source4/script/buildtree.pl
@@ -1,5 +1,5 @@
-#! /usr/bin/perl -w
-    eval 'exec /usr/bin/perl -S $0 ${1+"$@"}'
+#! /usr/bin/env perl -w
+    eval 'exec /usr/bin/env perl -S $0 ${1+"$@"}'
         if 0; #$running_under_some_shell
 
 use strict;

diff --git a/source4/script/cflags.pl b/source4/script/cflags.pl
index c848b56e7d0c0ddd55828b8dbfdef6c76b17be14..7ca8f12404aa894ae88067b3f2759961c6ac4a3f 100755 (executable)
--- a/source4/script/cflags.pl
+++ b/source4/script/cflags.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 # This is a hack to allow per target cflags. It isn't very elegant, but it
 # is the most portable idea we have come up with yet