From fb6446d8260a49dd35ba4ace00e84962082c49be Mon Sep 17 00:00:00 2001 From: Chris Allegretta Date: Wed, 25 Feb 2009 05:06:05 +0000 Subject: [PATCH] 2009-02-23 Eitan Adler * doc/man/Makefile.am: Fix make variable substitution to be more portable 2009-02-23 Chris Allegretta * doc/man/fr/Makefile.am: Add groff check fix to fr files. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4386 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 4 ++++ doc/man/Makefile.am | 8 ++++---- doc/man/fr/Makefile.am | 18 +++++++++++++++--- 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index b1b9b204..9217f8aa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,11 @@ +2009-02-23 Eitan Adler + * doc/man/Makefile.am: Fix make variable substitution to be more portable + 2009-02-23 Chris Allegretta * rcfile.c (parse_keybinding) - Define a var before tryung to use it. Whoops! * fix some redefinitions causing compiler warnings, from Eitan Adler. Other (hopefully) fixes for uncasted malloc()s, reported by the same. + * doc/man/fr/Makefile.am: Add groff check fix to fr files. GNU nano 2.1.9 - 2009.02.16 2009-02-16 Chris Allegretta diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am index e9326745..fbcdce86 100644 --- a/doc/man/Makefile.am +++ b/doc/man/Makefile.am @@ -16,18 +16,18 @@ BUILT_SOURCES = nano.1.html rnano.1.html endif endif -if GROFF_HTML nano_man_mans = nano.1 nanorc.5 rnano.1 +if GROFF_HTML htmlman_DATA = nano.1.html nanorc.5.html rnano.1.html htmlmandir = $(datadir)/nano/man-html nano_built_sources = nano.1.html nanorc.5.html rnano.1.html nano.1.html: nano.1 - groff -t -mandoc -Thtml < $< > $@ + groff -t -mandoc -Thtml < $? > $@ nanorc.5.html: nanorc.5 - groff -t -mandoc -Thtml < $< > $@ + groff -t -mandoc -Thtml < $? > $@ rnano.1.html: rnano.1 - groff -t -mandoc -Thtml < $< > $@ + groff -t -mandoc -Thtml < $? > $@ EXTRA_DIST = $(nano_man_mans) $(nano_built_sources) else diff --git a/doc/man/fr/Makefile.am b/doc/man/fr/Makefile.am index d898b102..7a430520 100644 --- a/doc/man/fr/Makefile.am +++ b/doc/man/fr/Makefile.am @@ -2,20 +2,32 @@ mandir = @mandir@/fr if USE_NANORC man_MANS = nano.1 nanorc.5 rnano.1 +if GROFF_HTML BUILT_SOURCES = nano.1.html nanorc.5.html rnano.1.html +endif else man_MANS = nano.1 rnano.1 +if GROFF_HTML BUILT_SOURCES = nano.1.html rnano.1.html endif +endif nano_man_mans = nano.1 nanorc.5 rnano.1 +if GROFF_HTML +htmlman_DATA = nano.1.html nanorc.5.html rnano.1.html +htmlmandir = $(datadir)/nano/man-html/fr + nano_built_sources = nano.1.html nanorc.5.html rnano.1.html nano.1.html: nano.1 - groff -t -mandoc -Thtml < $< > $@ + groff -t -mandoc -Thtml < $? > $@ nanorc.5.html: nanorc.5 - groff -t -mandoc -Thtml < $< > $@ + groff -t -mandoc -Thtml < $? > $@ rnano.1.html: rnano.1 - groff -t -mandoc -Thtml < $< > $@ + groff -t -mandoc -Thtml < $? > $@ EXTRA_DIST = $(nano_man_mans) $(nano_built_sources) +else +EXTRA_DIST = $(nano_man_mans) +endif + -- 2.39.5