Просмотр исходного кода

Correct Makefile bug that prevents installation if --without-sgml-doc
is passed.

Scott James Remnant лет назад: 22
Родитель
Сommit
1910e34806
3 измененных файлов с 8 добавлено и 0 удалено
  1. 5 0
      ChangeLog
  2. 2 0
      debian/changelog
  3. 1 0
      doc/Makefile.in

+ 5 - 0
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.

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

+ 1 - 0
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) ; \