diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-04-26 12:31:09 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:05:01 -0500 |
| commit | 23cf97680bf957b78464316af4c26f39d65e299a (patch) | |
| tree | deebd2758ab4c7a392ae3ae7319d05b96dae67ab | |
| parent | daa7e47b43d61813f5edb491ed344b9a79ff6c9e (diff) | |
| download | samba-23cf97680bf957b78464316af4c26f39d65e299a.tar.gz samba-23cf97680bf957b78464316af4c26f39d65e299a.tar.bz2 samba-23cf97680bf957b78464316af4c26f39d65e299a.zip | |
r15276: Fix path to perl on some hosts
Fix perl warning
(This used to be commit 50e184819d0f92da003c27c4d9adeeef3dfb55dd)
| -rw-r--r-- | source4/heimdal_build/config.mk | 2 | ||||
| -rwxr-xr-x | source4/librpc/idl-deps.pl | 2 | ||||
| -rw-r--r-- | source4/main.mk | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source4/heimdal_build/config.mk b/source4/heimdal_build/config.mk index 4f2d3a2456..cd15c442a4 100644 --- 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 9865a41283..176a47860e 100755 --- 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 a8860e3756..3de42c96cb 100644 --- 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) \ |