[Texi2html-cvs] texi2html ChangeLog Makefile.am Makefile.in TOD...

[Patrice Dumas]

CVSROOT:        /cvsroot/texi2html
Module name:    texi2html
Changes by:     Patrice Dumas <pertusus>        09/10/29 14:09:52

Modified files:
        .              : ChangeLog Makefile.am Makefile.in TODO 
                         texi2html.pl texi2html.spec texi2html.spec.in 

Log message:
                * texi2html.pl, Makefile.am: distinguish config files 
directories 
                and init files directories. For config files directories use 
the 
                command name. For init files also prepend a directories 
                like *texinfo/init and append CONF_DIRS.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texi2html/ChangeLog?cvsroot=texi2html&r1=1.450&r2=1.451
http://cvs.savannah.gnu.org/viewcvs/texi2html/Makefile.am?cvsroot=texi2html&r1=1.55&r2=1.56
http://cvs.savannah.gnu.org/viewcvs/texi2html/Makefile.in?cvsroot=texi2html&r1=1.79&r2=1.80
http://cvs.savannah.gnu.org/viewcvs/texi2html/TODO?cvsroot=texi2html&r1=1.154&r2=1.155
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.pl?cvsroot=texi2html&r1=1.347&r2=1.348
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.spec?cvsroot=texi2html&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.spec.in?cvsroot=texi2html&r1=1.5&r2=1.6

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/texi2html/texi2html/ChangeLog,v
retrieving revision 1.450
retrieving revision 1.451
diff -u -b -r1.450 -r1.451
--- ChangeLog   29 Oct 2009 08:54:10 -0000      1.450
+++ ChangeLog   29 Oct 2009 14:09:51 -0000      1.451
@@ -2,6 +2,10 @@
 
        * configure.ac, test/*: split node names in test that lead to 
        long out files, to be able to use tar-ustar instead of tar-pax.
+       * texi2html.pl, Makefile.am: distinguish config files directories 
+       and init files directories. For config files directories use the 
+       command name. For init files also prepend a directories 
+       like *texinfo/init and append CONF_DIRS.
 
 2009-10-26   Patrice Dumas  <address@hidden>
 

Index: Makefile.am
===================================================================
RCS file: /cvsroot/texi2html/texi2html/Makefile.am,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- Makefile.am 26 Oct 2009 23:21:55 -0000      1.55
+++ Makefile.am 29 Oct 2009 14:09:51 -0000      1.56
@@ -1,8 +1,9 @@
 ## Process this file with automake to produce Makefile.in
 
 SUBDIRS = . doc Tests test
-imagesdir = $(pkgdatadir)/images
-i18ndir = $(pkgdatadir)/i18n
+imagesdir = $(datadir)/texi2html/images
+i18ndir = $(datadir)/texi2html/i18n
+initdir = $(datadir)/texinfo/init
 
 #
 # This is to prevent texinfo.tex from being included
@@ -26,7 +27,7 @@
        formats/xml.init \
        formats/plaintext.init
 
-dist_pkgdata_DATA = maintained_extra/book.init \
+dist_init_DATA = maintained_extra/book.init \
        maintained_extra/chm.init \
        maintained_extra/tex4ht.init \
        maintained_extra/html32.init

Index: Makefile.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/Makefile.in,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -b -r1.79 -r1.80
--- Makefile.in 29 Oct 2009 08:54:10 -0000      1.79
+++ Makefile.in 29 Oct 2009 14:09:51 -0000      1.80
@@ -37,7 +37,7 @@
 host_triplet = @host@
 subdir = .
 DIST_COMMON = README $(am__configure_deps) $(dist_i18n_DATA) \
-       $(dist_images_DATA) $(dist_pkgdata_DATA) $(srcdir)/Makefile.am \
+       $(dist_images_DATA) $(dist_init_DATA) $(srcdir)/Makefile.am \
        $(srcdir)/Makefile.in $(srcdir)/check_texinfo.pl.in \
        $(srcdir)/manage_i18n.pl.in $(srcdir)/texi2html.pl \
        $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
@@ -75,7 +75,7 @@
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(i18ndir)" \
-       "$(DESTDIR)$(imagesdir)" "$(DESTDIR)$(pkgdatadir)"
+       "$(DESTDIR)$(imagesdir)" "$(DESTDIR)$(initdir)"
 SCRIPTS = $(bin_SCRIPTS) $(noinst_SCRIPTS)
 SOURCES =
 DIST_SOURCES =
@@ -86,7 +86,7 @@
        install-pdf-recursive install-ps-recursive install-recursive \
        installcheck-recursive installdirs-recursive pdf-recursive \
        ps-recursive uninstall-recursive
-DATA = $(dist_i18n_DATA) $(dist_images_DATA) $(dist_pkgdata_DATA)
+DATA = $(dist_i18n_DATA) $(dist_images_DATA) $(dist_init_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive        \
   distclean-recursive maintainer-clean-recursive
 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -220,8 +220,9 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = . doc Tests test
-imagesdir = $(pkgdatadir)/images
-i18ndir = $(pkgdatadir)/i18n
+imagesdir = $(datadir)/texi2html/images
+i18ndir = $(datadir)/texi2html/i18n
+initdir = $(datadir)/texinfo/init
 
 #
 # This is to prevent texinfo.tex from being included
@@ -244,7 +245,7 @@
        formats/xml.init \
        formats/plaintext.init
 
-dist_pkgdata_DATA = maintained_extra/book.init \
+dist_init_DATA = maintained_extra/book.init \
        maintained_extra/chm.init \
        maintained_extra/tex4ht.init \
        maintained_extra/html32.init
@@ -481,26 +482,26 @@
        test -n "$$files" || exit 0; \
        echo " ( cd '$(DESTDIR)$(imagesdir)' && rm -f" $$files ")"; \
        cd "$(DESTDIR)$(imagesdir)" && rm -f $$files
-install-dist_pkgdataDATA: $(dist_pkgdata_DATA)
+install-dist_initDATA: $(dist_init_DATA)
        @$(NORMAL_INSTALL)
-       test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
-       @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+       test -z "$(initdir)" || $(MKDIR_P) "$(DESTDIR)$(initdir)"
+       @list='$(dist_init_DATA)'; test -n "$(initdir)" || list=; \
        for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
          echo "$$d$$p"; \
        done | $(am__base_list) | \
        while read files; do \
-         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
-         $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
+         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(initdir)'"; \
+         $(INSTALL_DATA) $$files "$(DESTDIR)$(initdir)" || exit $$?; \
        done
 
-uninstall-dist_pkgdataDATA:
+uninstall-dist_initDATA:
        @$(NORMAL_UNINSTALL)
-       @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+       @list='$(dist_init_DATA)'; test -n "$(initdir)" || list=; \
        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
        test -n "$$files" || exit 0; \
-       echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
-       cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
+       echo " ( cd '$(DESTDIR)$(initdir)' && rm -f" $$files ")"; \
+       cd "$(DESTDIR)$(initdir)" && rm -f $$files
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -817,7 +818,7 @@
 all-am: Makefile $(SCRIPTS) $(DATA) all-local
 installdirs: installdirs-recursive
 installdirs-am:
-       for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(i18ndir)" 
"$(DESTDIR)$(imagesdir)" "$(DESTDIR)$(pkgdatadir)"; do \
+       for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(i18ndir)" 
"$(DESTDIR)$(imagesdir)" "$(DESTDIR)$(initdir)"; do \
          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
        done
 install: install-recursive
@@ -867,7 +868,7 @@
 info-am:
 
 install-data-am: install-dist_i18nDATA install-dist_imagesDATA \
-       install-dist_pkgdataDATA
+       install-dist_initDATA
 
 install-dvi: install-dvi-recursive
 
@@ -914,7 +915,7 @@
 ps-am:
 
 uninstall-am: uninstall-binSCRIPTS uninstall-dist_i18nDATA \
-       uninstall-dist_imagesDATA uninstall-dist_pkgdataDATA
+       uninstall-dist_imagesDATA uninstall-dist_initDATA
 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
        install-am install-strip tags-recursive
@@ -928,16 +929,15 @@
        html-am html-local info info-am install install-am \
        install-binSCRIPTS install-data install-data-am \
        install-dist_i18nDATA install-dist_imagesDATA \
-       install-dist_pkgdataDATA 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 maintainer-clean-generic mostlyclean \
-       mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \
-       uninstall uninstall-am uninstall-binSCRIPTS \
-       uninstall-dist_i18nDATA uninstall-dist_imagesDATA \
-       uninstall-dist_pkgdataDATA
+       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 \
+       maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+       pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+       uninstall-binSCRIPTS uninstall-dist_i18nDATA \
+       uninstall-dist_imagesDATA uninstall-dist_initDATA
 
 
 texi2html.temp: $(texi2html_sources)

Index: TODO
===================================================================
RCS file: /cvsroot/texi2html/texi2html/TODO,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -b -r1.154 -r1.155
--- TODO        22 Oct 2009 20:23:18 -0000      1.154
+++ TODO        29 Oct 2009 14:09:51 -0000      1.155
@@ -37,6 +37,9 @@
   - to open document
 
 * Document 
+  The fact that there are 3 commands that may be called.
+  The locations for config files and init files (including --conf-dirs).
+
   Texi2HTML::THIS_ELEMENT
   $NEW_CROSSREF_STYLE, $EXTERNAL_CROSSREF_SPLIT, $INLINE_INSERTCOPYING
   $OVERVIEW_LINK_TO_TOC

Index: texi2html.pl
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.pl,v
retrieving revision 1.347
retrieving revision 1.348
diff -u -b -r1.347 -r1.348
--- texi2html.pl        26 Oct 2009 23:21:55 -0000      1.347
+++ texi2html.pl        29 Oct 2009 14:09:51 -0000      1.348
@@ -42,11 +42,11 @@
 use File::Basename;
 # used to find a relative path back to the current working directory
 use File::Spec;
-#Â to determine the path separator and null file
+# to determine the path separator and null file
 use Config;
 
 #use encoding::warnings;
-#Â for translations
+# for translations
 #use encoding 'utf8';
 #use utf8;
 
@@ -58,7 +58,7 @@
 # Perl pragma to control optional warnings
 # use warnings;
 
-#Â determine the path separators
+# determine the path separators
 my $path_separator = $Config{'path_sep'};
 $path_separator = ':' if (!defined($path_separator));
 my $quoted_path_separator = quotemeta($path_separator);
@@ -86,7 +86,7 @@
 }
 
 # CVS version:
-# $Id: texi2html.pl,v 1.347 2009/10/26 23:21:55 pertusus Exp $
+# $Id: texi2html.pl,v 1.348 2009/10/29 14:09:51 pertusus Exp $
 
 # Homepage:
 my $T2H_HOMEPAGE = "http://www.nongnu.org/texi2html/";;
@@ -142,23 +142,8 @@
     $datadir = "/usr/local/share";
 }
 
-my $i18n_dir = 'i18n'; # name of the directory containing the per language 
files
-my $conf_file_name = 'Config' ;
-my $texinfo_htmlxref = 'htmlxref.cnf';
-
 my $target_prefix = "t_h";
 
-# directories for texi2html init files
-my @texi2html_config_dirs = ('./');
-push @texi2html_config_dirs, "$ENV{'HOME'}/.texi2html/" if 
(defined($ENV{'HOME'}));
-push @texi2html_config_dirs, "$sysconfdir/texi2html/" if 
(defined($sysconfdir));
-push @texi2html_config_dirs, "$pkgdatadir" if (defined($pkgdatadir));
-
-# directories for texinfo configuration files
-my @texinfo_config_dirs = ('./.texinfo/');
-push @texinfo_config_dirs, "$ENV{'HOME'}/.texinfo/" if (defined($ENV{'HOME'}));
-push @texinfo_config_dirs, "$sysconfdir/texinfo/" if (defined($sysconfdir));
-push @texinfo_config_dirs, "$datadir/texinfo/" if (defined($datadir));
 
 
 #+++########################################################################
@@ -203,7 +188,7 @@
    $default_output_format = $command_format{$my_command_name};
 }
 
-#Â This can be called from init files, mostly for formats.
+# This can be called from init files, mostly for formats.
 sub default_output_format()
 {
    return $default_output_format;
@@ -214,6 +199,32 @@
    return $my_command_name;
 }
 
+# Config files
+
+my $i18n_dir = 'i18n'; # name of the directory containing the per language 
files
+my $conf_file_name = 'Config' ;
+my $texinfo_htmlxref = 'htmlxref.cnf';
+
+# directories for config files
+my @texi2html_config_dirs = ('./');
+push @texi2html_config_dirs, "$ENV{'HOME'}/.$my_command_name/" if 
(defined($ENV{'HOME'}));
+push @texi2html_config_dirs, "$sysconfdir/$my_command_name/" if 
(defined($sysconfdir));
+push @texi2html_config_dirs, "$datadir/$my_command_name" if 
(defined($datadir));
+
+# directories for texinfo configuration files
+my @texinfo_config_dirs = ('./.texinfo/');
+push @texinfo_config_dirs, "$ENV{'HOME'}/.texinfo/" if (defined($ENV{'HOME'}));
+push @texinfo_config_dirs, "$sysconfdir/texinfo/" if (defined($sysconfdir));
+push @texinfo_config_dirs, "$datadir/texinfo/" if (defined($datadir));
+
+# directories for init files
+my @texi2html_init_dirs = @texi2html_config_dirs;
+# common directories for all command names
+foreach my $texinfo_config_dir (@texinfo_config_dirs)
+{
+   push @texi2html_init_dirs, "${texinfo_config_dir}init/";
+}
+
 #+++###########################################################################
 #                                                                             #
 # Initialization                                                              #
@@ -2168,7 +2179,17 @@
     my $all_files = shift;
     my $directories = shift;
 
-    $directories = [ @Texi2HTML::Config::CONF_DIRS, @texi2html_config_dirs ] 
if !defined($directories);
+    if (!defined($directories))
+    {
+       if ($all_files)
+       {
+           $directories = [ @texi2html_config_dirs ];
+       }
+       else
+       {
+           $directories = [ @Texi2HTML::Config::CONF_DIRS, 
@texi2html_init_dirs ];
+       }
+    }
 
     if ($file =~ /^\//)
     {

Index: texi2html.spec
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- texi2html.spec      2 Apr 2009 09:13:48 -0000       1.15
+++ texi2html.spec      29 Oct 2009 14:09:52 -0000      1.16
@@ -41,9 +41,16 @@
 make install DESTDIR=$RPM_BUILD_ROOT 
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
+ln -s texi2any $RPM_BUILD_ROOT%{_bindir}/texi2html
+
+rm -rf __dist_examples
+mkdir -p __dist_examples
+cp -a examples __dist_examples
+rm -f __dist_examples/examples/Makefile*
+
 # directories shared by all the texinfo implementations for common
 # config files, like htmlxref.cnf
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/texinfo 
$RPM_BUILD_ROOT%{_sysconfdir}/texinfo
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/texinfo
 
 
 %clean
@@ -60,18 +67,19 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README TODO %{name}.init
+%doc __dist_examples/examples/
 %{_bindir}/%{name}
-%{_datadir}/texinfo/html/%{name}.html
+%{_bindir}/texi2any
 %{_mandir}/man*/%{name}*
 %{_infodir}/%{name}.info*
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/*.init
-%{_datadir}/%{name}/*.texi
+%dir %{_datadir}/texinfo/
+%dir %{_datadir}/texinfo/init
+%{_datadir}/texinfo/init/*.init
+%{_datadir}/texinfo/html/%{name}.html
 %dir %{_datadir}/%{name}/i18n/
 %{_datadir}/%{name}/i18n/*
 %dir %{_datadir}/%{name}/images/
 %{_datadir}/%{name}/images/*
-%dir %{_datadir}/texinfo
 %dir %{_sysconfdir}/texinfo
 
 %changelog

Index: texi2html.spec.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.spec.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- texi2html.spec.in   26 Oct 2009 23:21:56 -0000      1.5
+++ texi2html.spec.in   29 Oct 2009 14:09:52 -0000      1.6
@@ -41,9 +41,16 @@
 make install DESTDIR=$RPM_BUILD_ROOT 
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
+ln -s texi2any $RPM_BUILD_ROOT%{_bindir}/texi2html
+
+rm -rf __dist_examples
+mkdir -p __dist_examples
+cp -a examples __dist_examples
+rm -f __dist_examples/examples/Makefile*
+
 # directories shared by all the texinfo implementations for common
 # config files, like htmlxref.cnf
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/texinfo 
$RPM_BUILD_ROOT%{_sysconfdir}/texinfo
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/texinfo
 
 
 %clean
@@ -60,18 +67,19 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README TODO %{name}.init
+%doc __dist_examples/examples/
 %{_bindir}/%{name}
-%{_datadir}/texinfo/html/%{name}.html
+%{_bindir}/texi2any
 %{_mandir}/man*/%{name}*
 %{_infodir}/%{name}.info*
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/*.init
-%{_datadir}/%{name}/*.texi
+%dir %{_datadir}/texinfo/
+%dir %{_datadir}/texinfo/init
+%{_datadir}/texinfo/init/*.init
+%{_datadir}/texinfo/html/%{name}.html
 %dir %{_datadir}/%{name}/i18n/
 %{_datadir}/%{name}/i18n/*
 %dir %{_datadir}/%{name}/images/
 %{_datadir}/%{name}/images/*
-%dir %{_datadir}/texinfo
 %dir %{_sysconfdir}/texinfo
 
 %changelog