Просмотр исходного кода

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.
Frank Lichtenheld лет назад: 19
Родитель
Сommit
eee7d3c8a1
4 измененных файлов с 10 добавлено и 10 удалено
  1. 0 1
      configure.ac
  2. 4 1
      debian/dpkg-dev.install
  3. 0 7
      scripts/Dpkg/Makefile.am
  4. 6 1
      scripts/Makefile.am

+ 0 - 1
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 ])

+ 4 - 1
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

+ 0 - 7
scripts/Dpkg/Makefile.am

@@ -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
-

+ 6 - 1
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 = \