Install archtable into /usr/share/dpkg/.

diff --git a/ChangeLog b/ChangeLog
index 82a34db8548a6c215a1a77306b0d9f33c0b30740..df93305e8e09dfc12c0604addd954dd21114e8c5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 Sun Jul 14 15:10:22 CDT 2002 Adam Heath <doogie@debian.org>
 
   * configure.in: Remove -ffunction-sections and -fdata-sections.
+  * Makefile.conf.in, Makefile.in, debian/rules:  Install archtable into
+    /usr/share/dpkg/.
 
 Sun Jul 14 15:09:24 CDT 2002 Adam Heath <doogie@debian.org>
 

diff --git a/Makefile.conf.in b/Makefile.conf.in
index d785fe6a2ae513a485fd9913fd0a2f64aa888386..67784842224c05dd6edcfec8414115f519a187e5 100644 (file)
--- a/Makefile.conf.in
+++ b/Makefile.conf.in
@@ -19,6 +19,7 @@ sbindir                       = @sbindir@
 
 libdir                 = @libdir@
 dpkglibdir             = $(libdir)/$(PACKAGE)
+dpkgsharedir           = $(sharedir)/$(PACKAGE)
 
 methodsdir             = $(dpkglibdir)/methods
 parsechangelogdir      = $(dpkglibdir)/parsechangelog

diff --git a/Makefile.in b/Makefile.in
index fe3a761624ed879f8f1ea5fec36514a048e19629..27ec971fd028d3126909ad0983ac04a6c99d90c4 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -16,7 +16,9 @@ all: version.h all-recursive
 
 install: all install-recursive
        $(mkinstalldirs) $(DESTDIR)$(dpkgconfdir)/origins
+       $(mkinstalldirs) $(DESTDIR)$(dpkgsharedir)/origins
        $(INSTALL_DATA) $(srcdir)/origin $(DESTDIR)$(dpkgconfdir)/origins/debian
+       $(INSTALL_DATA) $(srcdir)/archtable $(DESTDIR)$(dpkgsharedir)/archtable
 
 clean: clean-recursive
        rm -f $(GENFILES)

diff --git a/debian/changelog b/debian/changelog
index fab39dd51d051a75863f5ded09de25333fee13c4..34b9f29eaaf446d6c30676029e6db2e734bbd8a1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 dpkg (1.10.4) unstable; urgency=low
 
   * Remove -ffunction-sections and -fdata-sections.  Closes: #152130.
+  * Install archtable into /usr/share/dpkg/.
 
  -- Adam Heath <doogie@debian.org>  UNRELEASED
 

diff --git a/debian/rules b/debian/rules
index d97a7f9da199e9e3ed0eb2b33151b22cd433c76c..220033b8233baf24a18aedadbfdc1c0156a41b97 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -108,6 +108,7 @@ binary-dpkg-most binary-dpkg-static-most: binary-dpkg%-most: stamp-binary%
        cp -a $(INSTALL_TMP)/usr/lib/dpkg/mksplit $(TMP_DPKG)/usr/lib/dpkg/
        cp -a $(INSTALL_TMP)/usr/lib/dpkg/enoent $(TMP_DPKG)/usr/lib/dpkg/
        cp -a $(INSTALL_TMP)/usr/share/locale $(TMP_DPKG)/usr/share/
+       cp -a $(INSTALL_TMP)/usr/share/dpkg $(TMP_DPKG)/usr/share/
        set -e ; for i in dpkg-split dpkg-query ; do \
                cp -a $(INSTALL_TMP)/usr/bin/$$i $(TMP_DPKG)/usr/bin/ ; \
        done