2009-02-23 Eitan Adler <eitanadlerlist@gmail.com>

* doc/man/Makefile.am: Fix make variable substitution to be more portable

2009-02-23 Chris Allegretta <chrisa@asty.org>
	* 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
This commit is contained in:
Chris Allegretta 2009-02-25 05:06:05 +00:00
parent f86fa86089
commit fb6446d826
3 changed files with 23 additions and 7 deletions

View File

@ -1,7 +1,11 @@
2009-02-23 Eitan Adler <eitanadlerlist@gmail.com>
* doc/man/Makefile.am: Fix make variable substitution to be more portable
2009-02-23 Chris Allegretta <chrisa@asty.org> 2009-02-23 Chris Allegretta <chrisa@asty.org>
* rcfile.c (parse_keybinding) - Define a var before tryung to use it. Whoops! * rcfile.c (parse_keybinding) - Define a var before tryung to use it. Whoops!
* fix some redefinitions causing compiler warnings, from Eitan Adler. Other * fix some redefinitions causing compiler warnings, from Eitan Adler. Other
(hopefully) fixes for uncasted malloc()s, reported by the same. (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 GNU nano 2.1.9 - 2009.02.16
2009-02-16 Chris Allegretta <chrisa@asty.org> 2009-02-16 Chris Allegretta <chrisa@asty.org>

View File

@ -16,18 +16,18 @@ BUILT_SOURCES = nano.1.html rnano.1.html
endif endif
endif endif
if GROFF_HTML
nano_man_mans = nano.1 nanorc.5 rnano.1 nano_man_mans = nano.1 nanorc.5 rnano.1
if GROFF_HTML
htmlman_DATA = nano.1.html nanorc.5.html rnano.1.html htmlman_DATA = nano.1.html nanorc.5.html rnano.1.html
htmlmandir = $(datadir)/nano/man-html htmlmandir = $(datadir)/nano/man-html
nano_built_sources = nano.1.html nanorc.5.html rnano.1.html nano_built_sources = nano.1.html nanorc.5.html rnano.1.html
nano.1.html: nano.1 nano.1.html: nano.1
groff -t -mandoc -Thtml < $< > $@ groff -t -mandoc -Thtml < $? > $@
nanorc.5.html: nanorc.5 nanorc.5.html: nanorc.5
groff -t -mandoc -Thtml < $< > $@ groff -t -mandoc -Thtml < $? > $@
rnano.1.html: rnano.1 rnano.1.html: rnano.1
groff -t -mandoc -Thtml < $< > $@ groff -t -mandoc -Thtml < $? > $@
EXTRA_DIST = $(nano_man_mans) $(nano_built_sources) EXTRA_DIST = $(nano_man_mans) $(nano_built_sources)
else else

View File

@ -2,20 +2,32 @@ mandir = @mandir@/fr
if USE_NANORC if USE_NANORC
man_MANS = nano.1 nanorc.5 rnano.1 man_MANS = nano.1 nanorc.5 rnano.1
if GROFF_HTML
BUILT_SOURCES = nano.1.html nanorc.5.html rnano.1.html BUILT_SOURCES = nano.1.html nanorc.5.html rnano.1.html
endif
else else
man_MANS = nano.1 rnano.1 man_MANS = nano.1 rnano.1
if GROFF_HTML
BUILT_SOURCES = nano.1.html rnano.1.html BUILT_SOURCES = nano.1.html rnano.1.html
endif endif
endif
nano_man_mans = nano.1 nanorc.5 rnano.1 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_built_sources = nano.1.html nanorc.5.html rnano.1.html
nano.1.html: nano.1 nano.1.html: nano.1
groff -t -mandoc -Thtml < $< > $@ groff -t -mandoc -Thtml < $? > $@
nanorc.5.html: nanorc.5 nanorc.5.html: nanorc.5
groff -t -mandoc -Thtml < $< > $@ groff -t -mandoc -Thtml < $? > $@
rnano.1.html: rnano.1 rnano.1.html: rnano.1
groff -t -mandoc -Thtml < $< > $@ groff -t -mandoc -Thtml < $? > $@
EXTRA_DIST = $(nano_man_mans) $(nano_built_sources) EXTRA_DIST = $(nano_man_mans) $(nano_built_sources)
else
EXTRA_DIST = $(nano_man_mans)
endif