Hi,

  The current toplevel makefile uses the variable INSTALL to designate
the prefix of the installation directory.  That usage does not seem
common; at least, it clashes with the classical meaning of INSTALL in
the Autotools world (it holds the name of the 'install' program, or
equivalent).  This patch changes that to DESTDIR, which is the
conventional name.

Tested on an i686-pc-linux-gnu.

-- Gaby
2006-08-06  Gabriel Dos Reis  <[EMAIL PROTECTED]>

        * Makefile.pamphlet (DESTDIR): Rename from INSTALL, throughout.
        * Makefile.in: Regenerate.

*** Makefile.pamphlet   (revision 15561)
--- Makefile.pamphlet   (local)
*************** PART=   cprogs
*** 300,313 ****
  SUBPART= everything
  
  @
! \subsubsection{INSTALL and COMMAND}
  The install directory is [[/usr/local/axiom]] by default 
  but this can be changed on the command line by typing:
  \begin{verbatim}
! make INSTALL=/yourabsolutepath COMMAND=fullPathAndCommand install
  \end{verbatim}
  
! The [[COMMAND]] string has been modified to use the [[INSTALL]]
  variable so we can properly find the axiom command.
  
  The [[DOCUMENT]] variable is now set to replace the direct call
--- 300,313 ----
  SUBPART= everything
  
  @
! \subsubsection{DESTDIR and COMMAND}
  The install directory is [[/usr/local/axiom]] by default 
  but this can be changed on the command line by typing:
  \begin{verbatim}
! make DESTDIR=/yourabsolutepath COMMAND=fullPathAndCommand install
  \end{verbatim}
  
! The [[COMMAND]] string has been modified to use the [[DESTDIR]]
  variable so we can properly find the axiom command.
  
  The [[DOCUMENT]] variable is now set to replace the direct call
*************** TMP=${OBJ}/tmp
*** 330,337 ****
  SPADBIN=${MNT}/${SYS}/bin
  INC=${SPD}/src/include
  CCLBASE=${OBJ}/${SYS}/ccl/ccllisp
! INSTALL=/usr/local/axiom
! COMMAND=${INSTALL}/mnt/${SYS}/bin/axiom
  DOCUMENT=${SPADBIN}/document
  TANGLE=${SPADBIN}/lib/notangle
  WEAVE=${SPADBIN}/lib/noweave
--- 330,337 ----
  SPADBIN=${MNT}/${SYS}/bin
  INC=${SPD}/src/include
  CCLBASE=${OBJ}/${SYS}/ccl/ccllisp
! DESTDIR=/usr/local/axiom
! COMMAND=${DESTDIR}/mnt/${SYS}/bin/axiom
  DOCUMENT=${SPADBIN}/document
  TANGLE=${SPADBIN}/lib/notangle
  WEAVE=${SPADBIN}/lib/noweave
*************** lspclean:
*** 615,625 ****
  \subsection{install}
  <<install>>=
  install:
!       @echo 78 installing Axiom in ${INSTALL}
!       @mkdir -p ${INSTALL}
!       @cp -pr ${MNT} ${INSTALL}
        @echo '#!/bin/sh -' >${COMMAND}
!       @echo AXIOM=${INSTALL}/mnt/${SYS} >>${COMMAND}
        @echo export AXIOM >>${COMMAND}
        @echo PATH='$${AXIOM}/bin':'$${PATH}' >>${COMMAND}
        @echo export PATH >>${COMMAND}
--- 615,625 ----
  \subsection{install}
  <<install>>=
  install:
!       @echo 78 installing Axiom in ${DESTDIR}
!       @mkdir -p ${DESTDIR}
!       @cp -pr ${MNT} ${DESTDIR}
        @echo '#!/bin/sh -' >${COMMAND}
!       @echo AXIOM=${DESTDIR}/mnt/${SYS} >>${COMMAND}
        @echo export AXIOM >>${COMMAND}
        @echo PATH='$${AXIOM}/bin':'$${PATH}' >>${COMMAND}
        @echo export PATH >>${COMMAND}


_______________________________________________
Axiom-developer mailing list
Axiom-developer@nongnu.org
http://lists.nongnu.org/mailman/listinfo/axiom-developer

Reply via email to