texinfo makeinfo/Makefile.am texi2html/ChangeLo...

texinfo-commits
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo makeinfo/Makefile.am texi2html/ChangeLo...

From:	Patrice Dumas
Subject:	texinfo makeinfo/Makefile.am texi2html/ChangeLo...
Date:	Thu, 15 Jul 2010 15:20:43 +0000
CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        10/07/15 15:20:43

Modified files:
        makeinfo       : Makefile.am 
        texi2html      : ChangeLog Makefile.am Makefile.in TODO 

Log message:
                * Makefile.am: install texi2any as the main program. Install
                texi2html and makeinfo as links to texi2any.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/makeinfo/Makefile.am?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/ChangeLog?cvsroot=texinfo&r1=1.517&r2=1.518
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/Makefile.am?cvsroot=texinfo&r1=1.71&r2=1.72
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/Makefile.in?cvsroot=texinfo&r1=1.101&r2=1.102
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/TODO?cvsroot=texinfo&r1=1.188&r2=1.189

Patches:
Index: makeinfo/Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/Makefile.am,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- makeinfo/Makefile.am        24 Jun 2010 00:17:02 -0000      1.10
+++ makeinfo/Makefile.am        15 Jul 2010 15:20:28 -0000      1.11
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.10 2010/06/24 00:17:02 karl Exp $
+# $Id: Makefile.am,v 1.11 2010/07/15 15:20:28 pertusus Exp $
 # Makefile.am for texinfo/makeinfo.
 # Run automake in .. to produce Makefile.in from this.
 #
@@ -13,7 +13,7 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-bin_PROGRAMS = makeinfo
+noinst_PROGRAMS = makeinfo
 
 localedir = $(datadir)/locale
 AM_CPPFLAGS =                                  \

Index: texi2html/ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/texi2html/ChangeLog,v
retrieving revision 1.517
retrieving revision 1.518
diff -u -b -r1.517 -r1.518
--- texi2html/ChangeLog 15 Jul 2010 12:26:57 -0000      1.517
+++ texi2html/ChangeLog 15 Jul 2010 15:20:32 -0000      1.518
@@ -5,6 +5,8 @@
        license notices to GPLv3. Cleanup a bit the copyright
        years and mark explicitly the public domain files.
        * examples/noheaders.init: don't duplicate texi2html.init.
+       * Makefile.am: install texi2any as the main program. Install
+       texi2html and makeinfo as links to texi2any.
 
 2010-07-14  Patrice Dumas  <address@hidden>
 

Index: texi2html/Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/texi2html/Makefile.am,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -b -r1.71 -r1.72
--- texi2html/Makefile.am       13 Jul 2010 12:02:34 -0000      1.71
+++ texi2html/Makefile.am       15 Jul 2010 15:20:38 -0000      1.72
@@ -33,7 +33,7 @@
 # in the top-level distribution directory.
 TEXINFO_TEX = doc/texinfo.tex
 
-bin_SCRIPTS = texi2html
+bin_SCRIPTS = texi2any
 texi2html_additional_scripts = \
        MySimple.pm \
        T2h_i18n.pm \
@@ -182,7 +182,7 @@
 texi2html.temp: $(texi2html_sources)
        $(SHELL) $(srcdir)/buildt2h.sh $@ $^
 
-texi2html: texi2html.temp $(texi2html_formats)
+texi2any: texi2html.temp $(texi2html_formats)
        $(SHELL) $(srcdir)/addformats.sh $@ $^
        chmod a+x $@
 
@@ -247,10 +247,10 @@
 makeinfo.pl texi2any.pl:
        -$(LN_S) $(srcdir)/texi2html.pl $@
 
-html-local: texi2html
+makeinfo texi2html:
+       -$(LN_S) $(srcdir)/texi2any $@
 
-clean-local:
-       -rm -f texi2html texi2html.temp
+html-local: texi2html
 
 distclean-local:
        -rm -rf locales i18n
@@ -272,12 +272,21 @@
 
 uninstall-local:
        rm -rf $(DESTDIR)$(pkgdatadir)/lib/ $(DESTDIR)$(pkgdatadir)/i18n
+       rm -f $(DESTDIR)$(bindir)/texi2html
+       rm -f $(DESTDIR)$(bindir)/makeinfo
+
+install-exec-hook:
+       -$(LN_S) texi2any $(DESTDIR)$(bindir)/texi2html
+       -$(LN_S) texi2any $(DESTDIR)$(bindir)/makeinfo
 
 dist-hook:
        rm -rf `find $(distdir)/lib $(distdir)/i18n_ref -name CVS`
 
 ACLOCAL_AMFLAGS = -I m4
 
+CLEANFILES = texi2html texi2html.temp texi2any makeinfo \
+       texi2any.pl makeinfo.pl
+
 DISTCLEANFILES = po_messages/Makevars \
        po_messages/POTFILES.in \
        po_document/Makevars \

Index: texi2html/Makefile.in
===================================================================
RCS file: /sources/texinfo/texinfo/texi2html/Makefile.in,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -b -r1.101 -r1.102
--- texi2html/Makefile.in       13 Jul 2010 12:02:34 -0000      1.101
+++ texi2html/Makefile.in       15 Jul 2010 15:20:40 -0000      1.102
@@ -749,7 +749,7 @@
 # This is to prevent texinfo.tex from being included
 # in the top-level distribution directory.
 TEXINFO_TEX = doc/texinfo.tex
-bin_SCRIPTS = texi2html
+bin_SCRIPTS = texi2any
 texi2html_additional_scripts = \
        MySimple.pm \
        T2h_i18n.pm \
@@ -896,6 +896,9 @@
        images/xy_up_gr.png
 
 ACLOCAL_AMFLAGS = -I m4
+CLEANFILES = texi2html texi2html.temp texi2any makeinfo \
+       texi2any.pl makeinfo.pl
+
 DISTCLEANFILES = po_messages/Makevars \
        po_messages/POTFILES.in \
        po_document/Makevars \
@@ -1238,6 +1241,7 @@
 mostlyclean-generic:
 
 clean-generic:
+       -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -1249,7 +1253,7 @@
        @echo "it deletes files that may require special tools to rebuild."
 clean: clean-recursive
 
-clean-am: clean-generic clean-local mostlyclean-am
+clean-am: clean-generic mostlyclean-am
 
 distclean: distclean-recursive
        -rm -f Makefile
@@ -1276,7 +1280,8 @@
 install-dvi-am:
 
 install-exec-am: install-binSCRIPTS
-
+       @$(NORMAL_INSTALL)
+       $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
 install-html: install-html-recursive
 
 install-html-am:
@@ -1317,20 +1322,21 @@
        uninstall-dist_initDATA uninstall-local
 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) check-am \
-       ctags-recursive install-am install-strip tags-recursive
+       ctags-recursive install-am install-exec-am install-strip \
+       tags-recursive
 
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
        all all-am check check-am check-local clean clean-generic \
-       clean-local ctags ctags-recursive dist-hook distclean \
-       distclean-generic distclean-local distclean-tags distdir dvi \
-       dvi-am html html-am html-local info info-am install install-am \
-       install-binSCRIPTS install-data install-data-am \
-       install-data-local install-dist_imagesDATA \
-       install-dist_initDATA install-dvi install-dvi-am install-exec \
-       install-exec-am install-html install-html-am install-info \
-       install-info-am install-man install-pdf install-pdf-am \
-       install-ps install-ps-am install-strip installcheck \
-       installcheck-am installdirs installdirs-am maintainer-clean \
+       ctags ctags-recursive dist-hook distclean distclean-generic \
+       distclean-local distclean-tags distdir dvi dvi-am html html-am \
+       html-local info info-am install install-am install-binSCRIPTS \
+       install-data install-data-am install-data-local \
+       install-dist_imagesDATA install-dist_initDATA install-dvi \
+       install-dvi-am install-exec install-exec-am install-exec-hook \
+       install-html install-html-am install-info install-info-am \
+       install-man install-pdf install-pdf-am install-ps \
+       install-ps-am install-strip installcheck installcheck-am \
+       installdirs installdirs-am maintainer-clean \
        maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
        pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
        uninstall-binSCRIPTS uninstall-dist_imagesDATA \
@@ -1340,7 +1346,7 @@
 texi2html.temp: $(texi2html_sources)
        $(SHELL) $(srcdir)/buildt2h.sh $@ $^
 
-texi2html: texi2html.temp $(texi2html_formats)
+texi2any: texi2html.temp $(texi2html_formats)
        $(SHELL) $(srcdir)/addformats.sh $@ $^
        chmod a+x $@
 
@@ -1405,10 +1411,10 @@
 makeinfo.pl texi2any.pl:
        -$(LN_S) $(srcdir)/texi2html.pl $@
 
-html-local: texi2html
+makeinfo texi2html:
+       -$(LN_S) $(srcdir)/texi2any $@
 
-clean-local:
-       -rm -f texi2html texi2html.temp
+html-local: texi2html
 
 distclean-local:
        -rm -rf locales i18n
@@ -1430,6 +1436,12 @@
 
 uninstall-local:
        rm -rf $(DESTDIR)$(pkgdatadir)/lib/ $(DESTDIR)$(pkgdatadir)/i18n
+       rm -f $(DESTDIR)$(bindir)/texi2html
+       rm -f $(DESTDIR)$(bindir)/makeinfo
+
+install-exec-hook:
+       -$(LN_S) texi2any $(DESTDIR)$(bindir)/texi2html
+       -$(LN_S) texi2any $(DESTDIR)$(bindir)/makeinfo
 
 dist-hook:
        rm -rf `find $(distdir)/lib $(distdir)/i18n_ref -name CVS`

Index: texi2html/TODO
===================================================================
RCS file: /sources/texinfo/texinfo/texi2html/TODO,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -b -r1.188 -r1.189
--- texi2html/TODO      15 Jul 2010 13:47:33 -0000      1.188
+++ texi2html/TODO      15 Jul 2010 15:20:42 -0000      1.189
@@ -3,8 +3,6 @@
 Before next release
 -------------------
 
-ship texi2any, makeinfo
-
 Later
 -----
[Prev in Thread]
Current Thread
[Next in Thread]
texinfo makeinfo/Makefile.am texi2html/ChangeLo..., Patrice Dumas <=
Prev by Date: texinfo/texi2html TODO test/README test/content...
Next by Date: texinfo/texi2html documentlanguages.pl
Previous by thread: texinfo/texi2html TODO test/README test/content...
Next by thread: texinfo/texi2html documentlanguages.pl
Index(es):
- Date
- Thread