/[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 627 by ben.allan, Thu May 18 15:39:38 2006 UTC revision 628 by johnpye, Wed May 24 01:45:02 2006 UTC
# Line 1553  ASC_DISTDIR_REL_BIN=".." Line 1553  ASC_DISTDIR_REL_BIN=".."
1553  # prefix or datadir. If datadir not explicitly given, we  # prefix or datadir. If datadir not explicitly given, we
1554  # use prefix.  # use prefix.
1555  if test "x$datadir" = 'x${prefix}/share'; then  if test "x$datadir" = 'x${prefix}/share'; then
1556    INSTALL_SHARE="$prefix"    INSTALL_ASCDATA="$prefix"
1557  else  else
1558    INSTALL_SHARE="$datadir"    INSTALL_ASCDATA="$datadir"
1559  fi  fi
1560  DEFAULT_ASCENDLIBRARY="$INSTALL_SHARE/models"  DEFAULT_ASCENDLIBRARY="$INSTALL_ASCDATA/models"
1561  ASCEND_DEFAULTLIBRARY="$INSTALL_SHARE/models"  ASCEND_DEFAULTLIBRARY="$INSTALL_ASCDATA/models"
1562  ASC_ENV_TK_DEFAULT="$INSTALL_SHARE/TK"  ASC_ENV_TK_DEFAULT="\$ASCENDDIST/TK"
1563    
1564    
1565  #--------------------------------------------------------------------  #--------------------------------------------------------------------
# Line 1598  AC_SUBST(TKTABLE_LIB) Line 1598  AC_SUBST(TKTABLE_LIB)
1598  AC_SUBST(ASC_TK_LIBRARY)  AC_SUBST(ASC_TK_LIBRARY)
1599  AC_SUBST(ASC_TCL_LIBRARY)  AC_SUBST(ASC_TCL_LIBRARY)
1600  AC_SUBST(ASC_DISTDIR_REL_BIN)  AC_SUBST(ASC_DISTDIR_REL_BIN)
1601  AC_SUBST(INSTALL_SHARE)  AC_SUBST(INSTALL_ASCDATA)
1602  AC_SUBST(ASC_ENV_TK_DEFAULT)  AC_SUBST(ASC_ENV_TK_DEFAULT)
1603  AC_SUBST(TK_LD_HACK)  AC_SUBST(TK_LD_HACK)
1604  AC_SUBST(HAVE_TKTABLE)  AC_SUBST(HAVE_TKTABLE)

Legend:
Removed from v.627  
changed lines
  Added in v.628

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