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

Using 'dist_' prefixes and '+=' appending to produce 

simpler Automake files.  Patch by Mike Frysinger.



git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4694 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
Benno Schulenberg 2014-03-30 20:14:36 +00:00
parent e9a440f45f
commit 0e39d7fe4a
3 changed files with 26 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -2,6 +2,8 @@
* 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.
* doc/man/Makefile.am, doc/man/fr/Makefile.am - Use dist_ prefixes
and += appending supported by automake to produce simpler files.
2014-03-27 Benno Schulenberg <bensberg@justemail.net>
* src/nano.c (main) - Fix compilation with --disable-utf8.

29
doc/man/Makefile.am
View File

@ -1,25 +1,24 @@
if USE_NLS
SUBDIRS = fr
else
SUBDIRS =
if USE_NLS
SUBDIRS += fr
endif
BUILT_SOURCES =
dist_man_MANS = nano.1 rnano.1
if GROFF_HTML
BUILT_SOURCES += nano.1.html rnano.1.html
endif
if USE_NANORC
man_MANS = nano.1 nanorc.5 rnano.1
dist_man_MANS += nanorc.5
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
BUILT_SOURCES += nanorc.5.html
endif
endif
nano_man_mans = nano.1 nanorc.5 rnano.1
if GROFF_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
groff -t -mandoc -Thtml < $? > $@
@ -27,8 +26,6 @@ nanorc.5.html: nanorc.5
groff -t -mandoc -Thtml < $? > $@
rnano.1.html: rnano.1
groff -t -mandoc -Thtml < $? > $@
EXTRA_DIST = $(nano_man_mans) $(nano_built_sources)
else
EXTRA_DIST = $(nano_man_mans)
endif
EXTRA_DIST = $(BUILT_SOURCES)

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

@ -1,23 +1,22 @@
mandir = @mandir@/fr
htmldir = @htmldir@/fr
BUILT_SOURCES =
dist_man_MANS = nano.1 rnano.1
if GROFF_HTML
BUILT_SOURCES += nano.1.html rnano.1.html
endif
if USE_NANORC
man_MANS = nano.1 nanorc.5 rnano.1
dist_man_MANS += nanorc.5
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
BUILT_SOURCES += nanorc.5.html
endif
endif
nano_man_mans = nano.1 nanorc.5 rnano.1
if GROFF_HTML
html_DATA = nano.1.html nanorc.5.html rnano.1.html
nano_built_sources = nano.1.html nanorc.5.html rnano.1.html
dist_html_DATA = nano.1.html nanorc.5.html rnano.1.html
nano.1.html: nano.1
groff -t -mandoc -Thtml < $? > $@
@ -25,9 +24,6 @@ nanorc.5.html: nanorc.5
groff -t -mandoc -Thtml < $? > $@
rnano.1.html: rnano.1
groff -t -mandoc -Thtml < $? > $@
EXTRA_DIST = $(nano_man_mans) $(nano_built_sources)
else
EXTRA_DIST = $(nano_man_mans)
endif
EXTRA_DIST = $(BUILT_SOURCES)