diff options
author | Andrew Tridgell <tridge@samba.org> | 2008-05-28 12:07:20 +1000 |
---|---|---|
committer | Andrew Tridgell <tridge@samba.org> | 2008-05-28 12:07:20 +1000 |
commit | 275e057bea09c1d15228963a5b5650df28a4b24b (patch) | |
tree | fc24aee4174815930451e86f73d1997028169a49 /source4/librpc | |
parent | 0dbef08a9a4ae127f4eaf80dfbbb00e000bdf866 (diff) | |
parent | 715cee3bdbabd86b7603fbb43da470bdb8c1fe9d (diff) | |
download | samba-275e057bea09c1d15228963a5b5650df28a4b24b.tar.gz samba-275e057bea09c1d15228963a5b5650df28a4b24b.tar.bz2 samba-275e057bea09c1d15228963a5b5650df28a4b24b.zip |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit ecb0e5477aa63180daade5c597e7ac2aebfc1e15)
Diffstat (limited to 'source4/librpc')
-rw-r--r-- | source4/librpc/config.mk | 2 | ||||
-rwxr-xr-x | source4/librpc/idl-deps.pl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk index ab25921ef8..a39f50411b 100644 --- a/source4/librpc/config.mk +++ b/source4/librpc/config.mk @@ -350,7 +350,7 @@ NDR_WINBIND_OBJ_FILES = $(gen_ndrsrcdir)/ndr_winbind.o #PUBLIC_HEADERS += $(gen_ndrsrcdir)/winbind.h $(librpcsrcdir)/idl-deps: - ./$(librpcsrcdir)/idl-deps.pl $(librpcsrcdir)/idl/*.idl >$@ + $(PERL) $(librpcsrcdir)/idl-deps.pl $(librpcsrcdir)/idl/*.idl >$@ clean:: rm -f $(librpcsrcdir)/idl-deps diff --git a/source4/librpc/idl-deps.pl b/source4/librpc/idl-deps.pl index e630ee4f61..49fba4c935 100755 --- a/source4/librpc/idl-deps.pl +++ b/source4/librpc/idl-deps.pl @@ -4,8 +4,8 @@ use strict; my %vars = (); foreach(@ARGV) { - push (@{$vars{IDL_FILES}}, $_); my $b = $_; $b =~ s/.*\/(.*?).idl$/$1/; + push (@{$vars{IDL_FILES}}, "\$(librpcsrcdir)/idl/$b.idl"); push (@{$vars{IDL_HEADER_FILES}}, "\$(librpcsrcdir)/gen_ndr/$b.h"); push (@{$vars{IDL_NDR_PARSE_H_FILES}}, "\$(librpcsrcdir)/gen_ndr/ndr_$b.h"); push (@{$vars{IDL_NDR_PARSE_C_FILES}}, "\$(librpcsrcdir)/gen_ndr/ndr_$b.c"); |