r8784: Install pidl in "vendor" directories (matches debian policy)

(This used to be commit f6a12944d743c92270c3c647a47cd6b4f8185dd5)

diff --git a/packaging/debian/control b/packaging/debian/control
index 986b85d3e38c98118c406b5155b1a250c5b67568..91c390c2c44ba70e83a4f2a03b8ef7d189897043 100644 (file)
--- a/packaging/debian/control
+++ b/packaging/debian/control
@@ -3,7 +3,7 @@ Section: net
 Priority: optional
 Maintainer: Jelmer Vernooij <jelmer@samba.org>
 Standards-Version: 3.6.1.0
-Build-Depends: build-essential, libgtk2.0-dev, libgconf2-dev, libldap-dev, debhelper (>> 4.0.0), libparse-yapp-perl
+Build-Depends: build-essential, libgtk2.0-dev, libgconf2-dev, libldap-dev, debhelper (>> 4.0.0), libparse-yapp-perl, perl
 
 Package: samba4
 Architecture: all

diff --git a/packaging/debian/libparse-pidl-perl.install b/packaging/debian/libparse-pidl-perl.install
index 83aad38df9b6f3436b94d81072289e642994a600..96bc8b92aade1825d5b34c1ce1d0473aa48bfe94 100644 (file)
--- a/packaging/debian/libparse-pidl-perl.install
+++ b/packaging/debian/libparse-pidl-perl.install
@@ -1,3 +1,2 @@
 usr/bin/pidl
-usr/share/perl
-usr/lib/perl
+usr/share/perl5

diff --git a/packaging/debian/rules b/packaging/debian/rules
index 4d29c6abea8237143f85ab1e2f2f3ff1e1aef56b..4ae928a9e7609f40913498a759059d9309f1e96f 100755 (executable)
--- a/packaging/debian/rules
+++ b/packaging/debian/rules
@@ -24,7 +24,7 @@ configure:
                --with-syslog \
                --with-readline \
                --with-ldap 
-       cd $(SOURCEPATH)/build/pidl && perl Makefile.PL PREFIX=/usr
+       cd $(SOURCEPATH)/build/pidl && perl Makefile.PL verbose INSTALLDIRS=vendor PREFIX=/usr
        touch $@
 
 build: configure