svn commit: samba r15276 - in branches/SAMBA_4_0/source: . heimdal_build librpc

[jelmer at samba.org]

Author: jelmer
Date: 2006-04-26 12:31:09 +0000 (Wed, 26 Apr 2006)
New Revision: 15276

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15276

Log:
Fix path to perl on some hosts
Fix perl warning

Modified:
   branches/SAMBA_4_0/source/heimdal_build/config.mk
   branches/SAMBA_4_0/source/librpc/idl-deps.pl
   branches/SAMBA_4_0/source/main.mk


Changeset:
Modified: branches/SAMBA_4_0/source/heimdal_build/config.mk
===================================================================
--- branches/SAMBA_4_0/source/heimdal_build/config.mk	2006-04-26 12:25:39 UTC (rev 15275)
+++ branches/SAMBA_4_0/source/heimdal_build/config.mk	2006-04-26 12:31:09 UTC (rev 15276)
@@ -456,7 +456,7 @@
 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 $@

Modified: branches/SAMBA_4_0/source/librpc/idl-deps.pl
===================================================================
--- branches/SAMBA_4_0/source/librpc/idl-deps.pl	2006-04-26 12:25:39 UTC (rev 15275)
+++ branches/SAMBA_4_0/source/librpc/idl-deps.pl	2006-04-26 12:31:09 UTC (rev 15276)
@@ -5,7 +5,7 @@
 
 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");

Modified: branches/SAMBA_4_0/source/main.mk
===================================================================
--- branches/SAMBA_4_0/source/main.mk	2006-04-26 12:25:39 UTC (rev 15275)
+++ branches/SAMBA_4_0/source/main.mk	2006-04-26 12:31:09 UTC (rev 15276)
@@ -188,7 +188,7 @@
 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) \