From 1910e3480669dd32a751de420e3bec7f02f1f8dc Mon Sep 17 00:00:00 2001 From: Scott James Remnant Date: Fri, 7 May 2004 03:48:07 +0000 Subject: [PATCH] Correct Makefile bug that prevents installation if --without-sgml-doc is passed. --- ChangeLog | 5 +++++ debian/changelog | 2 ++ doc/Makefile.in | 1 + 3 files changed, 8 insertions(+) diff --git a/ChangeLog b/ChangeLog index 443f6ff8..2bfa14c8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri May 7 04:46:01 BST 2004 Scott James Remnant + + * doc/Makefile.in: Ensure that $(docdir) exists before attempting + to install the ChangeLog there. + Fri May 7 01:21:49 BST 2004 Scott James Remnant * dselect/pkginfo.cc: Replace &c. with the slightly clearer etc. diff --git a/debian/changelog b/debian/changelog index 080594bc..dc7e0878 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,8 @@ dpkg (1.10.22) unstable; urgency=low * Add support for DOS line-endings to md5sum. Closes: #246103. * Remove restriction that package names be at least two characters long. Closes: #237734. + * Create $(docdir) even when --without-sgml-doc is passed so the + ChangeLog can be installed. Closes: #137719. * Correct 'n' and 'p' key descriptions in dselect help message. Closes: #120562. * Stop hardcoding the list of manual page languages in debian/rules, diff --git a/doc/Makefile.in b/doc/Makefile.in index 331dcd3b..b06d3d01 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -37,6 +37,7 @@ ifeq (@USE_SGML_DOC@, true) $(INSTALL_DATA) $$i $(DESTDIR)$(docdir)/internals/$$bn ; \ done endif + $(mkinstalldirs) $(DESTDIR)$(docdir)/ $(INSTALL_DATA) $(srcdir)/ChangeLog $(DESTDIR)$(docdir)/ChangeLog.manuals set -e ; for i in ChangeLog THANKS TODO ; do \ $(INSTALL_DATA) $(top_srcdir)/$$i $(DESTDIR)$(docdir) ; \ -- 2.39.5