/[ascend]/trunk/base/autotools/configure.in
ViewVC logotype

Diff of /trunk/base/autotools/configure.in

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1074 by johnpye, Wed Jan 3 15:33:23 2007 UTC revision 1075 by johnpye, Tue Jan 9 03:15:50 2007 UTC
# Line 1556  ASC_DISTDIR_REL_BIN=".." Line 1556  ASC_DISTDIR_REL_BIN=".."
1556  # prefix or datadir. If datadir not explicitly given, we  # prefix or datadir. If datadir not explicitly given, we
1557  # use prefix.  # use prefix.
1558  if test "x$datadir" = 'x${prefix}/share'; then  if test "x$datadir" = 'x${prefix}/share'; then
1559      echo "--------PREFIX"
1560    INSTALL_ASCDATA="$prefix"    INSTALL_ASCDATA="$prefix"
1561  else  else
1562      echo "--------DATADIR"
1563    INSTALL_ASCDATA="$datadir"    INSTALL_ASCDATA="$datadir"
1564  fi  fi
1565  DEFAULT_ASCENDLIBRARY="$INSTALL_ASCDATA/models"  DEFAULT_ASCENDLIBRARY="$INSTALL_ASCDATA/models"
1566  ASCEND_DEFAULTLIBRARY="$INSTALL_ASCDATA/models"  ASCEND_DEFAULTLIBRARY="$INSTALL_ASCDATA/models"
1567  ASC_ENV_TK_DEFAULT="\$ASCENDDIST/TK"  ASC_ENV_TK_DEFAULT="\$ASCENDDIST/TK"
1568    
1569    echo "INSTALL_ASCDATA--- $INSTALL_ASCDATA"
1570    echo "LIBRARY----------- $DEFAULT_ASCENDLIBRARY"
1571    
1572  #--------------------------------------------------------------------  #--------------------------------------------------------------------
1573  #   The variables we substitute into the Makefile.in files  #   The variables we substitute into the Makefile.in files
# Line 1647  AC_OUTPUT( Line 1651  AC_OUTPUT(
1651         packages/Makefile:../../base/generic/packages/Makefile.in         packages/Makefile:../../base/generic/packages/Makefile.in
1652         solver/Makefile:../../base/generic/solver/Makefile.in         solver/Makefile:../../base/generic/solver/Makefile.in
1653         utilities/Makefile:../../base/generic/utilities/Makefile.in         utilities/Makefile:../../base/generic/utilities/Makefile.in
1654         utilities/config.h:../../base/generic/utilities/config.h.in         ../../base/generic/utilities/config.h
1655         ../../jam/Jamrules         ../../jam/Jamrules
1656         ../../tcltk/generic/Jamrules_tcltk         ../../tcltk/generic/Jamrules_tcltk
1657         $tkdir_makefiles         $tkdir_makefiles

Legend:
Removed from v.1074  
changed lines
  Added in v.1075

john.pye@anu.edu.au
ViewVC Help
Powered by ViewVC 1.1.22