From 4c65097945cca4d85e61d0542e46aa1d20575e27 Mon Sep 17 00:00:00 2001 From: Raphael Hertzog Date: Fri, 22 Feb 2008 08:42:04 +0100 Subject: [PATCH] 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 who noticed that. --- ChangeLog | 6 ++++++ debian/changelog | 2 ++ scripts/Makefile.am | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 4b804c08..613295b2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-02-22 Raphael Hertzog + Mike Frysinger + + * scripts/Makefile.am: Modify PATH during make check to include + build directories containing dpkg and the scripts dpkg-*. + 2008-02-20 Raphael Hertzog * scripts/Dpkg/Changelog.pm (parse_changelog): Fallback diff --git a/debian/changelog b/debian/changelog index 4de79785..9ef6decb 100644 --- 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 b003137f..aa938f56 100644 --- 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) -- 2.39.5