r15276: Fix path to perl on some hosts

Fix perl warning
(This used to be commit 50e184819d0f92da003c27c4d9adeeef3dfb55dd)

diff --git a/source4/heimdal_build/config.mk b/source4/heimdal_build/config.mk
index 4f2d3a2456ecbb22f91a57c78cdce310eacec6a5..cd15c442a48930041f93bc66e1b33b3716efaa12 100644 (file)
--- a/source4/heimdal_build/config.mk
+++ b/source4/heimdal_build/config.mk
@@ -456,7 +456,7 @@ include perl_path_wrapper.sh et_deps.pl heimdal/lib/krb5/krb5_err.et|
 heimdal/lib/roken/vis.h: heimdal/lib/roken/vis.hin
 heimdal/lib/roken/err.h: heimdal/lib/roken/err.hin
 
-include hcrypto-deps.pl heimdal/lib/des/*.h|
+include perl_path_wrapper.sh hcrypto-deps.pl heimdal/lib/des/*.h|
 
 heimdal/lib/des/hcrypto: 
        rm -f $@; ln -s ./../des $@

diff --git a/source4/librpc/idl-deps.pl b/source4/librpc/idl-deps.pl
index 9865a41283f89519210ac6af90d3ea36266a43f7..176a47860e9178cbea4e3f5ce2c485384e376ce6 100755 (executable)
--- a/source4/librpc/idl-deps.pl
+++ b/source4/librpc/idl-deps.pl
@@ -5,7 +5,7 @@ my %vars = ();
 
 foreach(@ARGV) {
        push (@{$vars{IDL_FILES}}, $_);
-       my $b = $_; $b =~ s/.*\/(.*?).idl$/\1/;
+       my $b = $_; $b =~ s/.*\/(.*?).idl$/$1/;
        push (@{$vars{IDL_HEADER_FILES}}, "librpc/gen_ndr/$b.h");
        push (@{$vars{IDL_NDR_HEADER_FILES}}, "librpc/gen_ndr/ndr_$b.h");
        push (@{$vars{IDL_NDR_PARSE_FILES}}, "librpc/gen_ndr/ndr_$b.c");

diff --git a/source4/main.mk b/source4/main.mk
index a8860e37567383bbdf0f60025888ed40ce67966e..3de42c96cb5ef6cfd2cc32bca1c433654d66fdb5 100644 (file)
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -188,7 +188,7 @@ installpidl: pidl/Makefile
 uninstallpidl: pidl/Makefile
        $(MAKE) -C pidl uninstall
 
-include librpc/idl-deps.pl librpc/idl/*.idl|
+include heimdal_build/perl_path_wrapper.sh ../librpc/idl-deps.pl librpc/idl/*.idl|
 
 $(IDL_HEADER_FILES) $(IDL_NDR_HEADER_FILES) $(IDL_NDR_PARSE_C_FILES) \
        $(IDL_NDR_CLIENT_C_FILES) $(IDL_NDR_CLIENT_H_FILES) \