old_contents: #!/usr/bin/env python
  import sys, os
  
  import chpl_platform, chpl_compiler, utils
  from utils import memoize
  
  @memoize
  def get():
      regexp_val = os.environ.get('CHPL_REGEXP')
      if not regexp_val:
          target_platform = chpl_platform.get('target')
          target_compiler = chpl_compiler.get('target')
          chpl_home = utils.get_chpl_home()
          regexp_target_dir = '{0}-{1}'.format(target_platform, target_compiler)
          regexp_subdir = os.path.join(chpl_home, 'third-party', 're2', 'install',
                                       regexp_target_dir)
          regexp_header = os.path.join(regexp_subdir, 'include', 're2', 're2.h')
          if os.path.exists(regexp_header):
              regexp_val = 're2'
          else:
              regexp_val = 'none'
      return regexp_val
  
  
  def _main():
      regexp_val = get()
      sys.stdout.write("{0}\n".format(regexp_val))
  
  
  if __name__ == '__main__':
      _main()
  
new_contents: #!/usr/bin/env python
  import sys, os
  
  import chpl_arch, chpl_platform, chpl_compiler, utils
  from utils import memoize
  
  @memoize
  def get():
      regexp_val = os.environ.get('CHPL_REGEXP')
      if not regexp_val:
          target_platform = chpl_platform.get('target')
          target_compiler = chpl_compiler.get('target')
          target_arch = chpl_arch.get('target')
          chpl_home = utils.get_chpl_home()
          regexp_target_dir = '{0}-{1}-{2}'.format(target_platform, target_compiler, target_arch)
          regexp_subdir = os.path.join(chpl_home, 'third-party', 're2', 'install',
                                       regexp_target_dir)
          regexp_header = os.path.join(regexp_subdir, 'include', 're2', 're2.h')
          if os.path.exists(regexp_header):
              regexp_val = 're2'
          else:
              regexp_val = 'none'
      return regexp_val
  
  
  def _main():
      regexp_val = get()
      sys.stdout.write("{0}\n".format(regexp_val))
  
  
  if __name__ == '__main__':
      _main()
  
subject: Fix chpl_regexp.py to support new install path.