Merge branch 'master' of ssh://git.samba.org/data/git/samba into singlerpc
authorJelmer Vernooij <jelmer@samba.org>
Wed, 17 Sep 2008 17:00:46 +0000 (19:00 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 17 Sep 2008 17:00:46 +0000 (19:00 +0200)
Conflicts:
source3/Makefile.in

source3/samba4.mk

index b145f4ca4b301389c77f1d55050189ceca627c0b..294eef8b8fbca0fc0c3613a8a7f415494b5a4684 100644 (file)
@@ -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