summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Bokovoy <ab@samba.org>2006-04-17 07:04:56 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:04:08 -0500
commit573b2f75fbc1de1572ac885804a94ff8ae7d499a (patch)
treea1a0327b7c9572ffbc8f42f756a2c8e11e14426c
parent84c6dea9b7e0a77368b8c50dbffd4045cda33805 (diff)
downloadsamba-573b2f75fbc1de1572ac885804a94ff8ae7d499a.tar.gz
samba-573b2f75fbc1de1572ac885804a94ff8ae7d499a.tar.bz2
samba-573b2f75fbc1de1572ac885804a94ff8ae7d499a.zip
r15099: An attempt to fix BSD make portability issues. With these changes Samba 4 builds successfully on NetBSD 3.0
(This used to be commit 71ea07e72d71b06166e0384950df83061a4677b8)
-rw-r--r--source4/heimdal_build/config.mk3
-rw-r--r--source4/lib/registry/config.mk2
-rw-r--r--source4/script/buildtree.pl4
-rwxr-xr-xsource4/script/cflags.pl2
4 files changed, 7 insertions, 4 deletions
diff --git a/source4/heimdal_build/config.mk b/source4/heimdal_build/config.mk
index c66784224a..591d15753f 100644
--- 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 9cc8c93450..2693f7dde3 100644
--- 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 41cbb3ad76..be5170e7d1 100644
--- 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 c848b56e7d..7ca8f12404 100755
--- 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