[SCM] Samba Shared Repository - branch master updated - da4399c509e9acfb372b90785292dcb1a08cf784

[Günther Deschner]

The branch, master has been updated
       via  da4399c509e9acfb372b90785292dcb1a08cf784 (commit)
      from  d940012dc8db9104c929f588f1d28ba18cbbd420 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit da4399c509e9acfb372b90785292dcb1a08cf784
Author: Günther Deschner <gd at samba.org>
Date:   Tue Oct 14 15:36:31 2008 +0200

    s3-build: add and use IDL_PATH while building IDL files.
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 source3/Makefile.in         |    2 +-
 source3/script/build_idl.sh |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/Makefile.in b/source3/Makefile.in
index bd29792..76fc101 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1198,10 +1198,10 @@ samba3-idl::
 		epmapper.idl messaging.idl xattr.idl misc.idl samr.idl security.idl \
 		dssetup.idl krb5pac.idl ntsvcs.idl libnetapi.idl drsuapi.idl drsblobs.idl \
 		nbt.idl" \
+		IDL_PATH="librpc/idl" \
 		CPP="$(CPP)" PIDL="../pidl/pidl" \
 	 srcdir="$(srcdir)" $(srcdir)/script/build_idl.sh $(PIDL_ARGS)
 
-
 #####################################################################
 
 
diff --git a/source3/script/build_idl.sh b/source3/script/build_idl.sh
index 2027fd3..75f8612 100755
--- a/source3/script/build_idl.sh
+++ b/source3/script/build_idl.sh
@@ -20,11 +20,11 @@ for f in ${IDL_FILES}; do
 	ndr="librpc/gen_ndr/ndr_$basename.c"
 
 	if [ -f $ndr ]; then
-		if [ "x`find librpc/idl/$f -newer $ndr -print`" = "xlibrpc/idl/$f" ]; then
-			list="$list librpc/idl/$f"
+		if [ "x`find ${IDL_PATH}/$f -newer $ndr -print`" = "x${IDL_PATH}/$f" ]; then
+			list="$list ${IDL_PATH}/$f"
 		fi
 	else 
-		list="$list librpc/idl/$f"
+		list="$list ${IDL_PATH}/$f"
 	fi
 done
 


-- 
Samba Shared Repository