Allow overriding $pkgdatadir in Dpkg

* scripts/Dpkg.pm: Allow overriding $pkgdatadir
with $ENV{DPKG_DATADIR}.
* scripts/Makefile.am (check): Use DPKG_DATADIR.
* debian/rules: Remove hack to copy data files
to build directory.

diff --git a/ChangeLog b/ChangeLog
index 1e2c95e4068eb663d1883088121c773057441a74..150571e3b2d4bedadab64b420718cbfd7bca5e1f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-02-17  Frank Lichtenheld  <djpig@debian.org>
+
+       * scripts/Dpkg.pm: Allow overriding $pkgdatadir
+       with $ENV{DPKG_DATADIR}.
+       * scripts/Makefile.am (check): Use DPKG_DATADIR.
+       * debian/rules: Remove hack to copy data files
+       to build directory.
+
+
 2008-02-17  Frank Lichtenheld  <djpig@debian.org>
            Matthias Klose  <doko@cs.tu-berlin.de>
 

diff --git a/debian/rules b/debian/rules
index 6bc9a2e87c2dc49bb52326fe9bc955fb3a73a298..73855d8c523c3e56f17e7b629be21d929bd8618b 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -55,7 +55,6 @@ build-tree/config.status: configure
                --localstatedir=/var/lib \
                --with-zlib=static \
                --with-bz2=static
-       cp cputable ostable triplettable build-tree/
 
 # Build the package in build-tree
 build: build-tree/config.status

diff --git a/man/dpkg-architecture.1 b/man/dpkg-architecture.1
index c7f625db1930aa5d8743cf17d79aa6e4d083167c..e6ed34a193af1de39f73280defb13c1c0c082478 100644 (file)
--- a/man/dpkg-architecture.1
+++ b/man/dpkg-architecture.1
@@ -267,7 +267,8 @@ dpkg\-architecture \-ai386 \-ilinux\-any
 .
 .SH FILES
 All these files have to be present for \fBdpkg-architecture\fP to
-work.
+work. Their location can be overriden at runtime with the environment
+variable DPKG_DATADIR.
 .TP
 .I /usr/share/dpkg/cputable
 Table of known CPU names and mapping to their GNU name.

diff --git a/scripts/Dpkg.pm b/scripts/Dpkg.pm
index 4a5dcbbf3d31c6ece5a0c839a2435ef2120eff75..30993ef59960939abe237a4ebefb948a1646b072 100644 (file)
--- a/scripts/Dpkg.pm
+++ b/scripts/Dpkg.pm
@@ -19,5 +19,6 @@ our $version = "1.14";
 our $admindir = "/var/lib/dpkg";
 our $dpkglibdir = ".";
 our $pkgdatadir = "..";
+$pkgdatadir = $ENV{DPKG_DATADIR} if defined $ENV{DPKG_DATADIR};
 
 1;

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index a0b1a96381391f3f6d6228fbeb156ad595cfdfef..b003137faf00e94feb94b760f8c4d87cb1648de3 100644 (file)
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -163,4 +163,4 @@ check: $(TEST_FILES) $(wildcard $(srcdir)/t/200_Dpkg_Shlibs/ld.so.conf*)
 # a bit hacky...
        $(mkdir_p) t.tmp
        cp -dRl $(srcdir)/t/200_Dpkg_Shlibs/ld.so.conf* t.tmp/
-       srcdir=$(srcdir) PERL5LIB=$(srcdir) PERL_DL_NONLAZY=1 $(PERL) -I$(srcdir) "-MExtUtils::Command::MM" "-e" "test_harness($(TEST_VERBOSE), '.')" $(TEST_FILES)
+       srcdir=$(srcdir) PERL5LIB=$(srcdir) DPKG_DATADIR=$(srcdir)/.. PERL_DL_NONLAZY=1 $(PERL) -I$(srcdir) "-MExtUtils::Command::MM" "-e" "test_harness($(TEST_VERBOSE), '.')" $(TEST_FILES)