diff --git a/ChangeLog b/ChangeLog index 8b628546a0860a93e815b4b90c3ad134b4ae49ea..0f9b026e38c2f0e7f2f568049c6b568ce8259f75 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,12 @@ CVS code - - General - - Reworked shortcut list for GNU compliance, put "Get Help" into - default list, removed "Goto Line", aligned "Read File" - with "Write Out" and "Replace" with "Where is" for - consistency. + GNU compliance issues: + - Reworked shortcut list, put "Get Help" into default list, + removed "Goto Line", aligned "Read File" with "Write Out" and + "Replace" with "Where is" for consistency. + - Added texinfo manual nano.texi. Added texi options to + Makefile.am. + - configure.in: - Autoconf compatibility fixes (Pavel Roskin) - cut.c: diff --git a/Makefile.am b/Makefile.am index 55e5592dd90b0423b2237827fc9db33cdae4f215..4cd0f14edd02cedd3ad04ec2c1ae41d615735d20 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,6 +14,9 @@ nano_SOURCES = cut.c \ man_MANS = nano.1 nano_LDADD = @INTLLIBS@ +info_TEXINFOS = nano.texi +MAKEINFO = makeinfo --no-split + EXTRA_DIST = AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README \ TODO install-sh missing mkinstalldirs nano.1 nano.1.html \ faq.html diff --git a/Makefile.in b/Makefile.in index 5600fe627b8784a99de3bb120bbf3db7886dd86f..a3bc76c330c25e2a8a036e59d9e4dd3c84cc7c9b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -75,7 +75,6 @@ INSTOBJEXT = @INSTOBJEXT@ INTLDEPS = @INTLDEPS@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ -MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ PACKAGE = @PACKAGE@ @@ -94,6 +93,9 @@ nano_SOURCES = cut.c files.c global.c move.c nano.c nano.h proto.h man_MANS = nano.1 nano_LDADD = @INTLLIBS@ +info_TEXINFOS = nano.texi +MAKEINFO = makeinfo --no-split + EXTRA_DIST = AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README TODO install-sh missing mkinstalldirs nano.1 nano.1.html faq.html @@ -120,6 +122,10 @@ CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ +TEXI2DVI = texi2dvi +INFO_DEPS = nano.info +DVIS = nano.dvi +TEXINFOS = nano.texi man1dir = $(mandir)/man1 MANS = $(man_MANS) @@ -138,7 +144,7 @@ OBJECTS = $(nano_OBJECTS) all: all-redirect .SUFFIXES: -.SUFFIXES: .S .c .o .s +.SUFFIXES: .S .c .dvi .info .o .ps .s .texi .texinfo .txi $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile @@ -230,6 +236,122 @@ nano: $(nano_OBJECTS) $(nano_DEPENDENCIES) @rm -f nano $(LINK) $(nano_LDFLAGS) $(nano_OBJECTS) $(nano_LDADD) $(LIBS) +nano.info: nano.texi +nano.dvi: nano.texi + + +DVIPS = dvips + +.texi.info: + @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9] + cd $(srcdir) \ + && $(MAKEINFO) `echo $< | sed 's,.*/,,'` + +.texi.dvi: + TEXINPUTS=.:$$TEXINPUTS \ + MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $< + +.texi: + @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9] + cd $(srcdir) \ + && $(MAKEINFO) `echo $< | sed 's,.*/,,'` + +.texinfo.info: + @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9] + cd $(srcdir) \ + && $(MAKEINFO) `echo $< | sed 's,.*/,,'` + +.texinfo: + @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9] + cd $(srcdir) \ + && $(MAKEINFO) `echo $< | sed 's,.*/,,'` + +.texinfo.dvi: + TEXINPUTS=.:$$TEXINPUTS \ + MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $< + +.txi.info: + @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9] + cd $(srcdir) \ + && $(MAKEINFO) `echo $< | sed 's,.*/,,'` + +.txi.dvi: + TEXINPUTS=.:$$TEXINPUTS \ + MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $< + +.txi: + @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9] + cd $(srcdir) \ + && $(MAKEINFO) `echo $< | sed 's,.*/,,'` +.dvi.ps: + $(DVIPS) $< -o $@ + +install-info-am: $(INFO_DEPS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(infodir) + @list='$(INFO_DEPS)'; \ + for file in $$list; do \ + d=$(srcdir); \ + for ifile in `cd $$d && echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \ + if test -f $$d/$$ifile; then \ + echo " $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile"; \ + $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile; \ + else : ; fi; \ + done; \ + done + @$(POST_INSTALL) + @if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \ + list='$(INFO_DEPS)'; \ + for file in $$list; do \ + echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file";\ + install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file || :;\ + done; \ + else : ; fi + +uninstall-info: + $(PRE_UNINSTALL) + @if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \ + ii=yes; \ + else ii=; fi; \ + list='$(INFO_DEPS)'; \ + for file in $$list; do \ + test -z "$ii" \ + || install-info --info-dir=$(DESTDIR)$(infodir) --remove $$file; \ + done + @$(NORMAL_UNINSTALL) + list='$(INFO_DEPS)'; \ + for file in $$list; do \ + (cd $(DESTDIR)$(infodir) && rm -f $$file $$file-[0-9] $$file-[0-9][0-9]); \ + done + +dist-info: $(INFO_DEPS) + list='$(INFO_DEPS)'; \ + for base in $$list; do \ + d=$(srcdir); \ + for file in `cd $$d && eval echo $$base*`; do \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file; \ + done; \ + done + +mostlyclean-aminfo: + -rm -f nano.aux nano.cp nano.cps nano.dvi nano.fn nano.fns nano.ky \ + nano.kys nano.ps nano.log nano.pg nano.toc nano.tp nano.tps \ + nano.vr nano.vrs nano.op nano.tr nano.cv nano.cn + +clean-aminfo: + +distclean-aminfo: + +maintainer-clean-aminfo: + cd $(srcdir) && for i in $(INFO_DEPS); do \ + rm -f $$i; \ + if test "`echo $$i-[0-9]*`" != "$$i-[0-9]*"; then \ + rm -f $$i-[0-9]*; \ + fi; \ + done + install-man1: $(mkinstalldirs) $(DESTDIR)$(man1dir) @list='$(man1_MANS)'; \ @@ -416,9 +538,10 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done -info-am: + $(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-info +info-am: $(INFO_DEPS) info: info-recursive -dvi-am: +dvi-am: $(DVIS) dvi: dvi-recursive check-am: all-am check: check-recursive @@ -430,21 +553,22 @@ all-recursive-am: config.h install-exec-am: install-binPROGRAMS install-exec: install-exec-recursive -install-data-am: install-man +install-data-am: install-info-am install-man install-data: install-data-recursive install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-recursive -uninstall-am: uninstall-binPROGRAMS uninstall-man +uninstall-am: uninstall-binPROGRAMS uninstall-info uninstall-man uninstall: uninstall-recursive -all-am: Makefile $(PROGRAMS) $(MANS) config.h +all-am: Makefile $(INFO_DEPS) $(PROGRAMS) $(MANS) config.h all-redirect: all-recursive-am install-strip: $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: installdirs-recursive installdirs-am: - $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1 + $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(infodir) \ + $(DESTDIR)$(mandir)/man1 mostlyclean-generic: @@ -457,25 +581,27 @@ distclean-generic: maintainer-clean-generic: mostlyclean-am: mostlyclean-hdr mostlyclean-binPROGRAMS \ - mostlyclean-compile mostlyclean-tags \ + mostlyclean-compile mostlyclean-aminfo mostlyclean-tags \ mostlyclean-generic mostlyclean: mostlyclean-recursive -clean-am: clean-hdr clean-binPROGRAMS clean-compile clean-tags \ - clean-generic mostlyclean-am +clean-am: clean-hdr clean-binPROGRAMS clean-compile clean-aminfo \ + clean-tags clean-generic mostlyclean-am clean: clean-recursive distclean-am: distclean-hdr distclean-binPROGRAMS distclean-compile \ - distclean-tags distclean-generic clean-am + distclean-aminfo distclean-tags distclean-generic \ + clean-am distclean: distclean-recursive -rm -f config.status maintainer-clean-am: maintainer-clean-hdr maintainer-clean-binPROGRAMS \ - maintainer-clean-compile maintainer-clean-tags \ - maintainer-clean-generic distclean-am + maintainer-clean-compile maintainer-clean-aminfo \ + maintainer-clean-tags maintainer-clean-generic \ + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." @@ -486,7 +612,9 @@ maintainer-clean: maintainer-clean-recursive mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \ maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ -maintainer-clean-compile install-man1 uninstall-man1 install-man \ +maintainer-clean-compile install-info-am uninstall-info \ +mostlyclean-aminfo distclean-aminfo clean-aminfo \ +maintainer-clean-aminfo install-man1 uninstall-man1 install-man \ uninstall-man install-data-recursive uninstall-data-recursive \ install-exec-recursive uninstall-exec-recursive installdirs-recursive \ uninstalldirs-recursive all-recursive check-recursive \