Adapt installation method of Perl modules to 'master'

master and dpkg-shlibdeps-buxy used two different methods
for installing the Perl modules. Use the one from master.

diff --git a/configure.ac b/configure.ac
index 123cb4e7422c4aa889b6b532fbdfcb147f6ef2ae..5e2eb924087a967c715bde5b9cbbc764ea96e934 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -112,7 +112,6 @@ AC_CONFIG_FILES([ Makefile
                  origins/Makefile
                  po/Makefile.in
                  scripts/Makefile
-                 scripts/Dpkg/Makefile
                  scripts/po/Makefile.in
                  src/Makefile
                  utils/Makefile ])

diff --git a/debian/dpkg-dev.install b/debian/dpkg-dev.install
index ae1a2e4b89ee61a7343ca363aa3ff186ba066c72..2b7299559f67c281fb1666ca1c73b20714765075 100644 (file)
--- a/debian/dpkg-dev.install
+++ b/debian/dpkg-dev.install
@@ -16,8 +16,11 @@ usr/bin/dpkg-scansources
 usr/bin/dpkg-shlibdeps
 usr/bin/dpkg-source
 usr/lib/dpkg/controllib.pl
-usr/lib/dpkg/Dpkg
 usr/lib/dpkg/parsechangelog
+usr/share/perl5/Dpkg/Version.pm
+usr/share/perl5/Dpkg/ErrorHandling.pm
+usr/share/perl5/Dpkg/Shlibs.pm
+usr/share/perl5/Dpkg/Shlibs
 usr/share/locale/*/LC_MESSAGES/dpkg-dev.mo
 usr/share/man/*/*/822-date.1
 usr/share/man/*/822-date.1

diff --git a/scripts/Dpkg/Makefile.am b/scripts/Dpkg/Makefile.am
deleted file mode 100644 (file)
index abbccf3..0000000
--- a/scripts/Dpkg/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-
-shlibsmodulesdir=$(pkglibdir)/Dpkg/Shlibs
-dpkgmodulesdir=$(pkglibdir)/Dpkg
-
-dist_shlibsmodules_DATA = Shlibs/Objdump.pm Shlibs/SymbolFile.pm
-dist_dpkgmodules_DATA = ErrorHandling.pm Gettext.pm Shlibs.pm Version.pm
-

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index c1d2ed251a187613f7415bef1e34fc828cf6d71a..d5e54b2412508ed6577cf081100cbce91c55a5e5 100644 (file)
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = po Dpkg
+SUBDIRS = po
 
 bin_SCRIPTS = \
        822-date \
@@ -57,7 +57,12 @@ CLEANFILES = \
 
 perllibdir = $(PERL_LIBDIR)
 nobase_dist_perllib_DATA = \
+       Dpkg/Shlibs.pm \
+       Dpkg/Shlibs/Objdump.pm \
+       Dpkg/Shlibs/SymbolFile.pm \
+       Dpkg/ErrorHandling.pm \
        Dpkg/Gettext.pm \
+       Dpkg/Version.pm \
        Dpkg.pm
 
 dist_pkglib_SCRIPTS = \