ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Using standard doc dir for installing html files. Patch by Mike Frysinger. 

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4693 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
Benno Schulenberg 2014-03-30 20:08:45 +00:00
parent 803c478e88
commit e9a440f45f
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,10 +1,15 @@
2014-03-30 Mike Frysinger <vapier@gentoo.org>
* doc/Makefile.am, doc/man/Makefile.am, doc/man/fr/Makefile.am -
The build already provides a standard htmldir for installing html
files. Use that instead of creating our own.
2014-03-27 Benno Schulenberg <bensberg@justemail.net>
* src/nano.c (main) - Fix compilation with --disable-utf8.
* src/global.c (shortcut_init) - Place a help string among
its kin, adjust some indentation, group function pairs more
tightly, bundle restricted stuff, and delete an unused item.
2014-03-27 Mike Frysinger <vapier@gentoo.org>.
2014-03-27 Mike Frysinger <vapier@gentoo.org>
* configure.ac - Make --disable-nanorc with --enable-color barf.
* configure.ac - Allow --disable-utf8 and --enable-utf8 to work.
@ -21,7 +26,7 @@
* src/help.c - Fix compilation with --disable-browser.
* src/{proto.h,browser.c,help.c} - Remove a superfluous function.
2014-03-26 Mike Frysinger <vapier@gentoo.org>.
2014-03-26 Mike Frysinger <vapier@gentoo.org>
* configure.ac - Clean up most of the --with/--enable flags:
- use AS_HELP_STRING instead of writing the text ourselves;
- use the normal enable_xxx var AC_ARG_ENABLE creates for us;

2
doc/Makefile.am
View File

@ -4,4 +4,4 @@ else
SUBDIRS = man texinfo
endif
EXTRA_DIST = faq.html
dist_html_DATA = faq.html

3
doc/man/Makefile.am
View File

@ -18,8 +18,7 @@ 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
dist_html_DATA = 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

4
doc/man/fr/Makefile.am
View File

@ -1,4 +1,5 @@
mandir = @mandir@/fr
htmldir = @htmldir@/fr
if USE_NANORC
man_MANS = nano.1 nanorc.5 rnano.1
@ -14,8 +15,7 @@ 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
html_DATA = nano.1.html nanorc.5.html rnano.1.html
nano_built_sources = nano.1.html nanorc.5.html rnano.1.html