summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2004-05-14 12:01:31 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:53:45 -0500
commit19fba1fafabefab8f6382c54809c45daceda9030 (patch)
treed8fea6b141db3cef538e2f362a546e55ec4fbbcc
parent6b921d1d2175f3b6267cb6e89b463cff852880cc (diff)
downloadsamba-19fba1fafabefab8f6382c54809c45daceda9030.tar.gz
samba-19fba1fafabefab8f6382c54809c45daceda9030.tar.bz2
samba-19fba1fafabefab8f6382c54809c45daceda9030.zip
r725: fix usage of $PERL to "$PERL" to handle perl -W correct
metze (This used to be commit b1161c4c832dd0a2975eee0908d9d5cd6171f608)
-rw-r--r--source4/build/smb_build/makefile.pl4
-rwxr-xr-xsource4/script/build_idl.sh4
2 files changed, 4 insertions, 4 deletions
diff --git a/source4/build/smb_build/makefile.pl b/source4/build/smb_build/makefile.pl
index 39f7ec8572..97ae7eb211 100644
--- a/source4/build/smb_build/makefile.pl
+++ b/source4/build/smb_build/makefile.pl
@@ -121,7 +121,7 @@ sub _prepare_IDL($)
$output = "
idl_full: build/pidl/idl.pm
- CPP=\"\@CPP\@\" script/build_idl.sh FULL
+ CPP=\"\@CPP\@\" PERL=\"\$(PERL)\" script/build_idl.sh FULL
idl: build/pidl/idl.pm
\@CPP=\"\@CPP\@\" script/build_idl.sh
@@ -583,7 +583,7 @@ delheaders: pch_clean
-rm -f \$(builddir)/include/proto.h \$(builddir)/include/build_env.h:
include/proto.h:
- \@cd \$(srcdir) && \$(SHELL) script/mkproto.sh \$(PERL) \\
+ \@cd \$(srcdir) && \$(SHELL) script/mkproto.sh \"\$(PERL)\" \\
-h _PROTO_H_ \$(builddir)/include/proto.h \\
\$(PROTO_OBJS)
diff --git a/source4/script/build_idl.sh b/source4/script/build_idl.sh
index a51a487612..ec67c0aec0 100755
--- a/source4/script/build_idl.sh
+++ b/source4/script/build_idl.sh
@@ -4,8 +4,8 @@ FULLBUILD=$1
[ -d librpc/gen_ndr ] || mkdir -p librpc/gen_ndr || exit 1
-PIDL="./build/pidl/pidl.pl --output librpc/gen_ndr/ndr_ --parse --header --parser --server"
-TABLES="./build/pidl/tables.pl --output librpc/gen_ndr/tables"
+PIDL="$PERL ./build/pidl/pidl.pl --output librpc/gen_ndr/ndr_ --parse --header --parser --server"
+TABLES="$PERL ./build/pidl/tables.pl --output librpc/gen_ndr/tables"
if [ x$FULLBUILD = xFULL ]; then
echo Rebuilding all idl files in librpc/idl