Re: [Axiom-developer] axiom.silver

[Gabriel Dos Reis]

Camm,

  Following up on my earlier message, is it OK to apply this to
gcl-2.6.8pre CVS?  I'm using it in the GCL version present in Axiom
build-improvement branch.

Thanks!

-- Gaby

Index: ChangeLog
===================================================================
RCS file: /sources/gcl/gcl/ChangeLog,v
retrieving revision 1.14
diff -p -r1.14 ChangeLog
*** ChangeLog   3 Feb 2002 18:44:06 -0000       1.14
--- ChangeLog   17 Sep 2006 21:06:01 -0000
***************
*** 1,3 ****
--- 1,8 ----
+ 2006-09-17  Gabriel Dos Reis  <address@hidden>
+
+       * makefile (install1): Gracefully handle build of info files.
+       * info/makefile: Likewise.
+
  2002-01-25  Camm Maguire  <address@hidden>

        * /cvsroot/gcl/gcl/ChangeLog, /cvsroot/gcl/gcl/ChangeLog.orig:
Index: makefile
===================================================================
RCS file: /sources/gcl/gcl/makefile,v
retrieving revision 1.73.4.2.2.21.6.1.8.9
diff -p -r1.73.4.2.2.21.6.1.8.9 makefile
*** makefile    15 Sep 2006 17:45:18 -0000      1.73.4.2.2.21.6.1.8.9
--- makefile    17 Sep 2006 21:06:01 -0000
*************** install1:
*** 196,203 ****
  #     (cd $(DESTDIR)$(INSTALL_LIB_DIR)/gcl-tk/demos ; \
  #     echo '(load "../tkl.o")(TK::GET-AUTOLOADS (directory "*.lisp"))' | 
../../$(PORTDIR)/$(FLISP)$(EXE)) ; fi
        if test "$(EMACS_SITE_LISP)" != "" ; then (cd elisp ; $(MAKE) install 
DESTDIR=$(DESTDIR)) ; fi
!       if test "$(INFO_DIR)" != "unknown"; then (cd info ; $(MAKE) ; $(MAKE) 
install DESTDIR=$(DESTDIR)) ; fi
!       if test "$(INFO_DIR)" != "unknown"; then (cd xgcl-2 ; $(MAKE) install 
DESTDIR=$(DESTDIR)) ; fi
        if gcc --version | grep -i mingw >/dev/null 2>&1 ; then cp 
COPYING.LIB-2.0 readme-bin.mingw $(prefix) ; fi
        if gcc --version | grep -i mingw >/dev/null 2>&1 ; then cp gcl.ico 
$(prefix)/bin ; fi
        if gcc --version | grep -i mingw >/dev/null 2>&1 ; then rm -rf 
$(prefix)/install; mkdir $(prefix)/install ; cp windows/install.lsp 
$(prefix)/install ; windows/instdos.sh windows/sysdir.bat 
$(prefix)/bin/sysdir.bat ; fi
--- 196,203 ----
  #     (cd $(DESTDIR)$(INSTALL_LIB_DIR)/gcl-tk/demos ; \
  #     echo '(load "../tkl.o")(TK::GET-AUTOLOADS (directory "*.lisp"))' | 
../../$(PORTDIR)/$(FLISP)$(EXE)) ; fi
        if test "$(EMACS_SITE_LISP)" != "" ; then (cd elisp ; $(MAKE) install 
DESTDIR=$(DESTDIR)) ; fi
!       -if test "$(INFO_DIR)" != "unknown"; then (cd info ; $(MAKE) ; $(MAKE) 
install DESTDIR=$(DESTDIR)) ; fi
!       -if test "$(INFO_DIR)" != "unknown"; then (cd xgcl-2 ; $(MAKE) install 
DESTDIR=$(DESTDIR)) ; fi
        if gcc --version | grep -i mingw >/dev/null 2>&1 ; then cp 
COPYING.LIB-2.0 readme-bin.mingw $(prefix) ; fi
        if gcc --version | grep -i mingw >/dev/null 2>&1 ; then cp gcl.ico 
$(prefix)/bin ; fi
        if gcc --version | grep -i mingw >/dev/null 2>&1 ; then rm -rf 
$(prefix)/install; mkdir $(prefix)/install ; cp windows/install.lsp 
$(prefix)/install ; windows/instdos.sh windows/sysdir.bat 
$(prefix)/bin/sysdir.bat ; fi
Index: info/makefile
===================================================================
RCS file: /sources/gcl/gcl/info/makefile,v
retrieving revision 1.23.6.4.2.1
diff -p -r1.23.6.4.2.1 makefile
*** info/makefile       25 Jun 2004 22:40:25 -0000      1.23.6.4.2.1
--- info/makefile       17 Sep 2006 21:06:11 -0000
*************** gcl.info: ${GCL_MAN} gcl.texi
*** 58,73 ****
  #     $(HTML_CMD) gcl.texi

  gcl-si/index.html: ${GCL_SI} gcl-si.texi
!       $(HTML_CMD) gcl-si.texi

  gcl-tk/index.html: ${GCL_TK} gcl-tk.texi
!       $(HTML_CMD) gcl-tk.texi

  gcl/index.html: gcl.texi
!       $(HTML_CMD) gcl.texi

  install-html: gcl-tk_toc.html gcl-si_toc.html gcl_toc.html
!       cp *.html /d/www/gcl

  install: $(GCL_DVI) $(GCL_HTML)
        mkdir -p $(DESTDIR)${INFO_DIR}
--- 58,73 ----
  #     $(HTML_CMD) gcl.texi

  gcl-si/index.html: ${GCL_SI} gcl-si.texi
!       -$(HTML_CMD) gcl-si.texi

  gcl-tk/index.html: ${GCL_TK} gcl-tk.texi
!       -$(HTML_CMD) gcl-tk.texi

  gcl/index.html: gcl.texi
!       -$(HTML_CMD) gcl.texi

  install-html: gcl-tk_toc.html gcl-si_toc.html gcl_toc.html
!       -cp *.html /d/www/gcl

  install: $(GCL_DVI) $(GCL_HTML)
        mkdir -p $(DESTDIR)${INFO_DIR}