summaryrefslogtreecommitdiffstats
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-05-10 00:46:25 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-05-10 00:46:25 +0200
commitd0096e90ba9d8aa6b339022bac194e57ae0a2b7a (patch)
tree0aeda94e72979ea3d190ff0c76be8d711c1a6640 /source4
parentca6ac11b46a75bf02cf873c6aedb4f85af227168 (diff)
downloadsamba-d0096e90ba9d8aa6b339022bac194e57ae0a2b7a.tar.gz
samba-d0096e90ba9d8aa6b339022bac194e57ae0a2b7a.tar.xz
samba-d0096e90ba9d8aa6b339022bac194e57ae0a2b7a.zip
Fix installation of pidl perl files, torture pc file.
(This used to be commit 32da606e3759026c2744f853cd8948333ed0579c)
Diffstat (limited to 'source4')
-rw-r--r--source4/lib/torture/config.mk3
-rw-r--r--source4/lib/torture/torture.pc.in (renamed from source4/torture/torture.pc.in)0
-rw-r--r--source4/librpc/config.mk2
-rw-r--r--source4/pidl/config.mk2
4 files changed, 5 insertions, 2 deletions
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/torture/torture.pc.in b/source4/lib/torture/torture.pc.in
index 6582816cb5..6582816cb5 100644
--- a/source4/torture/torture.pc.in
+++ b/source4/lib/torture/torture.pc.in
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 \