Correct Makefile bug that prevents installation if --without-sgml-doc

is passed.

diff --git a/ChangeLog b/ChangeLog
index 443f6ff849249cbf7f7db35f569deec77e3ed710..2bfa14c8fcd65d56a7339e1886934eb43d1d3e16 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri May 7 04:46:01 BST 2004 Scott James Remnant <scott@netsplit.com>
+
+  * 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 <scott@netsplit.com>
 
   * dselect/pkginfo.cc: Replace &c. with the slightly clearer etc.

diff --git a/debian/changelog b/debian/changelog
index 080594bcab2c636a06779382cae20ed8a346d71a..dc7e0878c40c97fc1bb8dbf0b2bc82ff816e9e50 100644 (file)
--- 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 331dcd3b29f539834b6a25fa9bf04156723fa0b1..b06d3d01e105035507daf898531b07daf07492e8 100644 (file)
--- 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) ; \