From d0096e90ba9d8aa6b339022bac194e57ae0a2b7a Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 10 May 2008 00:46:25 +0200
Subject: Fix installation of pidl perl files, torture pc file. (This used to
 be commit 32da606e3759026c2744f853cd8948333ed0579c)

---
 source4/lib/torture/config.mk     |  3 +++
 source4/lib/torture/torture.pc.in | 12 ++++++++++++
 source4/librpc/config.mk          |  2 +-
 source4/pidl/config.mk            |  2 +-
 source4/torture/torture.pc.in     | 12 ------------
 5 files changed, 17 insertions(+), 14 deletions(-)
 create mode 100644 source4/lib/torture/torture.pc.in
 delete mode 100644 source4/torture/torture.pc.in

diff --git a/source4/lib/torture/config.mk b/source4/lib/torture/config.mk
index e981ee0c99..15c64786c5 100644
--- a/source4/lib/torture/config.mk
+++ b/source4/lib/torture/config.mk
@@ -5,6 +5,9 @@ PUBLIC_DEPENDENCIES = \
 		LIBSAMBA-UTIL \
 		LIBTALLOC
 
+TORTURE_VERSION = 0.0.1
+TORTURE_SO_VERSION = 0
+
 PC_FILES += lib/torture/torture.pc
 torture_OBJ_FILES = $(addprefix lib/torture/, torture.o)
 
diff --git a/source4/lib/torture/torture.pc.in b/source4/lib/torture/torture.pc.in
new file mode 100644
index 0000000000..6582816cb5
--- /dev/null
+++ b/source4/lib/torture/torture.pc.in
@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+modulesdir=${prefix}/modules/torture
+
+Name: torture
+Description: Samba torture (test) suite
+Requires: talloc
+Version: 0.0.1
+Libs: -L${libdir} -ltorture 
+Cflags: -I${includedir}  -DHAVE_IMMEDIATE_STRUCTURES=1
diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index 11a320a583..527fec92f6 100644
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -340,7 +340,7 @@ NDR_WINSREPL_OBJ_FILES = librpc/gen_ndr/ndr_winsrepl.o
 PUBLIC_DEPENDENCIES = LIBNDR NDR_NETLOGON
 
 NDR_WINBIND_OBJ_FILES = librpc/gen_ndr/ndr_winbind.o
-PUBLIC_HEADERS += librpc/gen_ndr/winbind.h
+#PUBLIC_HEADERS += librpc/gen_ndr/winbind.h
 
 librpc/idl-deps:
 	./librpc/idl-deps.pl librpc/idl/*.idl >$@
diff --git a/source4/pidl/config.mk b/source4/pidl/config.mk
index 25cea495a7..19b2d53659 100644
--- a/source4/pidl/config.mk
+++ b/source4/pidl/config.mk
@@ -6,7 +6,7 @@ pidl-testcov: pidl/Makefile
 
 installpidl:: pidl/Makefile
 	$(MAKE) -C pidl install_vendor VENDORPREFIX=$(prefix) \
-		                           INSTALLVENDORLIB=$(libdir) \
+		                           INSTALLVENDORLIB=$(datarootdir)/perl5 \
 								   INSTALLVENDORBIN=$(bindir) \
 								   INSTALLVENDORSCRIPT=$(bindir) \
 								   INSTALLVENDORMAN1DIR=$(mandir)/man1 \
diff --git a/source4/torture/torture.pc.in b/source4/torture/torture.pc.in
deleted file mode 100644
index 6582816cb5..0000000000
--- a/source4/torture/torture.pc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-modulesdir=${prefix}/modules/torture
-
-Name: torture
-Description: Samba torture (test) suite
-Requires: talloc
-Version: 0.0.1
-Libs: -L${libdir} -ltorture 
-Cflags: -I${includedir}  -DHAVE_IMMEDIATE_STRUCTURES=1
-- 
cgit