/[ascend]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 2028 by jpye, Thu Apr 30 08:27:56 2009 UTC revision 2029 by jpye, Thu Apr 30 09:19:48 2009 UTC
# Line 2470  subst_dict = { Line 2470  subst_dict = {
2470  #define ASC_ABSOLUTE_PATHS @ASC_ABSOLUTE_PATHS@  #define ASC_ABSOLUTE_PATHS @ASC_ABSOLUTE_PATHS@
2471  #if ASC_ABSOLUTE_PATHS  #if ASC_ABSOLUTE_PATHS
2472  # define ASCENDDIST_DEFAULT "@ASCENDDIST_DEFAULT@"  # define ASCENDDIST_DEFAULT "@ASCENDDIST_DEFAULT@"
2473  # define ASCENDTK_DEAFULT "@ASCENDTK_DEFAULT@"  # define ASCENDTK_DEFAULT "@ASCENDTK_DEFAULT@"
2474  # define ASCENDLIBRARY_DEFAULT "@ASCENDLIBRARY_DEFAULT@"  # define ASCENDLIBRARY_DEFAULT "@ASCENDLIBRARY_DEFAULT@"
2475  # define ASCENDSOLVERS_DEFAULT "@ASCENDSOLVERS_DEFAULT@"  # define ASCENDSOLVERS_DEFAULT "@ASCENDSOLVERS_DEFAULT@"
2476  #else  #else
# Line 2757  if env.get('CAN_INSTALL'): Line 2757  if env.get('CAN_INSTALL'):
2757      libname = "${INSTALL_LIB}/%s%s" % (soname_full,soname_minor)      libname = "${INSTALL_LIB}/%s%s" % (soname_full,soname_minor)
2758      install_lib = env.InstallLibraryAs("${INSTALL_ROOT}"+libname, [libascend])      install_lib = env.InstallLibraryAs("${INSTALL_ROOT}"+libname, [libascend])
2759      if env['ABSOLUTE_PATHS']:      if env['ABSOLUTE_PATHS']:
2760          link_target = install_lib          link_target = libname
2761      else:      else:
2762          link_target = "%s%s" % (soname_full,soname_minor)          link_target = "%s%s" % (soname_full,soname_minor)
2763    
2764      link1 = "${INSTALL_LIB}/%s" % soname_clean      link1 = "${INSTALL_LIB}/%s" % soname_clean
2765      install_link1 = None      install_link1 = None
2766      if env.subst(link1) != env.subst(libname):      if env.subst(link1) != env.subst(libname):
2767          cwd = os.getcwd()          #                           v--link to create       v--file to link to   command          
2768          install_link1 = env.Command("${INSTALL_ROOT}"+link1,libname,"ln -f -s %s $TARGET" % link_target)          install_link1 = env.Command("${INSTALL_ROOT}"+link1,install_lib
2769            #    v-- command to do it (note the trick about
2770                ,"ln -f -s %s $TARGET" % link_target
2771            )
2772    
2773      link2 = "$INSTALL_LIB/%s" % soname_full      link2 = "${INSTALL_LIB}/%s" % soname_full
2774      install_link2 = None      install_link2 = None
2775      if soname_minor:      if soname_minor:
2776          install_link2 = env.Command("${INSTALL_ROOT}"+link2,libname,"ln -f -s %s $TARGET"%link_target)          install_link2 = env.Command("${INSTALL_ROOT}"+link2,install_lib
2777                ,"ln -f -s %s $TARGET" % link_target
2778            )
2779    
2780      env.InstallProgram(Dir(env.subst("$INSTALL_ROOT$INSTALL_BIN")),ascendconfig)      env.InstallProgram(Dir(env.subst("$INSTALL_ROOT$INSTALL_BIN")),ascendconfig)
2781    

Legend:
Removed from v.2028  
changed lines
  Added in v.2029

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