Fix make check to work on systems without dpkg in the standard PATH

* scripts/Makefile.am: Modify PATH to include build directories
containing the dpkg binary and the related scripts. That way
the tests work even if dpkg is not yet available. Thanks to
Mike Frysinger <vapier@gentoo.org> who noticed that.

diff --git a/ChangeLog b/ChangeLog
index 4b804c08b30d89faa4bec5e601da1c76653e06c5..613295b2b3dc52086ce37c671aa87975aa3e1da4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-22  Raphael Hertzog  <hertzog@debian.org>
+           Mike Frysinger <vapier@gentoo.org>
+
+       * scripts/Makefile.am: Modify PATH during make check to include
+       build directories containing dpkg and the scripts dpkg-*.
+
 2008-02-20  Raphael Hertzog  <hertzog@debian.org>
 
        * scripts/Dpkg/Changelog.pm (parse_changelog): Fallback

diff --git a/debian/changelog b/debian/changelog
index 4de797852e63ab4ba792f7fba45ff13238e4a0a5..9ef6decb3dc9835eee4a788eb7bafa71b9b53388 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,8 @@ dpkg (1.14.17) UNRELEASED; urgency=low
     to find it. Closes: #462413
   * Fix Dpkg::Version to import _g() from Dpkg::Gettext. Thanks to Adam Heath
     for spotting this. Closes: #465651
+  * Change PATH during make check to look into build directories containing
+    dpkg and the related scripts. Thanks to Mike Frysinger. Closes: #466957
 
   [ Frank Lichtenheld ]
   * Add a warning in dpkg-buildpackage if the build-dependencies are not

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index b003137faf00e94feb94b760f8c4d87cb1648de3..aa938f56afde50b1c6bb56a9ec9dec32950abfd8 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) DPKG_DATADIR=$(srcdir)/.. PERL_DL_NONLAZY=1 $(PERL) -I$(srcdir) "-MExtUtils::Command::MM" "-e" "test_harness($(TEST_VERBOSE), '.')" $(TEST_FILES)
+       PATH="$(top_builddir)/src:$(top_builddir)/scripts:$(PATH)" srcdir=$(srcdir) PERL5LIB=$(srcdir) DPKG_DATADIR=$(srcdir)/.. PERL_DL_NONLAZY=1 $(PERL) -I$(srcdir) "-MExtUtils::Command::MM" "-e" "test_harness($(TEST_VERBOSE), '.')" $(TEST_FILES)