Sfoglia il codice sorgente

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.
Raphael Hertzog 18 anni fa
parent
commit
4c65097945
3 ha cambiato i file con 9 aggiunte e 1 eliminazioni
  1. 6 0
      ChangeLog
  2. 2 0
      debian/changelog
  3. 1 1
      scripts/Makefile.am

+ 6 - 0
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

+ 2 - 0
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

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