[SCM] Samba Shared Repository - branch master updated - 87e4e0e9406a4805c0116652b2ea34114acc279a

[Jelmer Vernooij]

The branch, master has been updated
       via  87e4e0e9406a4805c0116652b2ea34114acc279a (commit)
       via  661d25402ecb36a35bee6b282440854f5280781a (commit)
      from  f4293618a712ca7ce59b7d695e2e3d918ddbb542 (commit)

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


- Log -----------------------------------------------------------------
commit 87e4e0e9406a4805c0116652b2ea34114acc279a
Merge: 661d25402ecb36a35bee6b282440854f5280781a f4293618a712ca7ce59b7d695e2e3d918ddbb542
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Wed Sep 17 19:00:46 2008 +0200

    Merge branch 'master' of ssh://git.samba.org/data/git/samba into singlerpc
    
    Conflicts:
    	source3/Makefile.in

commit 661d25402ecb36a35bee6b282440854f5280781a
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Wed Sep 17 18:57:40 2008 +0200

    Fix pidl/config.m4 location.

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

Summary of changes:
 source3/samba4.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/samba4.mk b/source3/samba4.mk
index b145f4c..294eef8 100644
--- a/source3/samba4.mk
+++ b/source3/samba4.mk
@@ -57,7 +57,7 @@ endif
 
 INTERN_LDFLAGS = -L${builddir}/bin/static -L${builddir}/bin/shared
 
-pidldir = $(samba4srcdir)/pidl
+pidldir = $(samba4srcdir)/../pidl
 include $(pidldir)/config.mk
 include samba4-config.mk
 include samba4-templates.mk


-- 
Samba Shared Repository