texinfo/info Makefile.am,1.1.1.1,1.2 info.c,1.1.1.1,1.2

[dirt]

Update of /cvsroot/texinfo/texinfo/info
In directory sheep:/tmp/cvs-serv8294/info

Modified Files:
        Makefile.am info.c 
Log Message:
2004-01-09  Alper Ersoy  <address@hidden>

        * info/Makefile.am: define INFODIR2 that points to $datadir/info.

        * info/info.c (main): prepend INFODIR2 to infopath, if defined and if
        not the same with INFODIR.



Index: Makefile.am
===================================================================
RCS file: /cvsroot/texinfo/texinfo/info/Makefile.am,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Makefile.am 6 Dec 2003 01:32:34 -0000       1.1.1.1
--- Makefile.am 9 Jan 2004 09:07:44 -0000       1.2
***************
*** 20,23 ****
--- 20,24 ----
  
  localedir = $(datadir)/locale
+ infodir2 = $(datadir)/info
  
  # -I. for funs.h.
***************
*** 25,29 ****
  # we need to override it, so include them ourselves.
  INCLUDES = -I. -I$(top_srcdir)/lib -I../intl -I.. -I$(srcdir)
! DEFS += -DINFODIR=\"$(infodir)\" -DLOCALEDIR=\"$(localedir)\"
  LDADD = ../lib/libtxi.a $(TERMLIBS) $(LIBINTL)
  
--- 26,31 ----
  # we need to override it, so include them ourselves.
  INCLUDES = -I. -I$(top_srcdir)/lib -I../intl -I.. -I$(srcdir)
! DEFS += -DLOCALEDIR=\"$(localedir)\" -DINFODIR=\"$(infodir)\" \
!       -DINFODIR2=\"$(infodir2)\"
  LDADD = ../lib/libtxi.a $(TERMLIBS) $(LIBINTL)
  

Index: info.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/info/info.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** info.c      6 Dec 2003 01:32:45 -0000       1.1.1.1
--- info.c      9 Jan 2004 09:07:44 -0000       1.2
***************
*** 324,328 ****
            info_add_path (DEFAULT_INFOPATH, INFOPATH_PREPEND);
  #ifdef INFODIR /* from the Makefile */
!          info_add_path (INFODIR, INFOPATH_PREPEND);
  #endif
          }
--- 324,334 ----
            info_add_path (DEFAULT_INFOPATH, INFOPATH_PREPEND);
  #ifdef INFODIR /* from the Makefile */
!           info_add_path (INFODIR, INFOPATH_PREPEND);
! #endif
! #ifdef INFODIR2 /* from the Makefile, too */
! #  ifdef INFODIR
!           if (!STREQ (INFODIR, INFODIR2))
! #  endif
!             info_add_path (INFODIR2, INFOPATH_PREPEND);
  #endif
          }