reap 6.0.2 → 9.2.0

data/{data/reap/scaffold/standard/setup.rb → task/setup}

@@ -1,3 +1,6 @@
+#!/usr/bin/env ruby
+
+# Setup and install.
 #
 # setup.rb
 #
@@ -6,52 +9,49 @@
 # This program is free software.
 # You can distribute/modify this program under the terms of
 # the GNU LGPL, Lesser General Public License version 2.1.
+
+#
+# Was hardcoded as 'InstalledFiles'
 #
 
-#############################
-# Forked from version 3.2.1 #
-#                           #
-#                    -trans #
-#############################
-
-# CHANGE No longer need to support 1.4.6 or 1.6 versions of Ruby.
-
-# unless Enumerable.method_defined?(:map)   # Ruby 1.4.6
-#   module Enumerable
-#     alias map collect
-#   end
-# end
-
-# unless File.respond_to?(:read)   # Ruby 1.6
-#   def File.read(fname)
-#     open(fname) {|f|
-#       return f.read
-#     }
-#   end
-# end
-
-# This is hack!
-# This is needed to install within an abitrary root dir.
-# B/c setup.rb has become spegetti code, I was forced to do this hack.
-# Setup.rb shuld be re-writ. I would use package.rb instead but
-# it lacks hooks and extension compilation. But we'll keep
-# an eye on that one for the future.  -trans.
-
-$setup_install_root = nil
-ARGV.each{ |a|
-  if md = /--root=(.*)/.match( a )
-    $setup_install_root = md[1]
-  end
-}
-if $setup_install_root
-  ARGV.delete("--root=#{$setup_install_root}")
-  $setup_install_root = File.expand_path($setup_install_root)
-  puts "(root=#{$setup_install_root})"
+INSTALLED_MANIFEST = '.installed'
+
+#
+# Was hardcoded as 'packages'.
+#
+
+PACKAGES_DIRECTORY = 'src'
+
+#
+# Locate and move to the root dir of the project/package.
+# This is setup to put setup in a utilities subdir.
+#
+# TODO Make more robust.
+#
+
+ROOT_DIRECTORY = File.dirname(File.dirname(File.expand_path($0)))
+
+Dir.chdir(ROOT_DIRECTORY)
+
+#
+# Deal with Ruby version issues.
+#
+
+unless Enumerable.method_defined?(:map)   # Ruby 1.4.6
+  module Enumerable
+    alias map collect
+  end
 end
 
-# Windows?
+unless File.respond_to?(:read)   # Ruby 1.6
+  def File.read(fname)
+    open(fname) {|f|
+      return f.read
+    }
+  end
+end
 
-unless Errno.const_defined?(:ENOTEMPTY)
+unless Errno.const_defined?(:ENOTEMPTY)   # Windows?
   module Errno
     class ENOTEMPTY
       # We do not raise this exception, implementation is not needed.
@@ -89,11 +89,17 @@ class ConfigTable
   attr_accessor :install_prefix
   attr_accessor :config_opt
 
-  def verbose=(x) @verbose = x end
-  def verbose?()  @verbose     end
+  attr_writer :verbose
 
-  def no_harm=(x) @no_harm = x end
-  def no_harm?()  @no_harm     end
+  def verbose?
+    @verbose
+  end
+
+  attr_writer :no_harm
+
+  def no_harm?
+    @no_harm
+  end
 
   def [](key)
     lookup(key).resolve(self)
@@ -137,7 +143,9 @@ class ConfigTable
     end
   end
 
-  def savefile() '.config' end
+  def savefile
+    '.config'
+  end
 
   def load_savefile
     begin
@@ -160,126 +168,124 @@ class ConfigTable
   end
 
   def load_standard_entries
-    #standard_entries(@rbconfig).each do |ent|
-    standard_entries.each do |ent|
+    standard_entries(@rbconfig).each do |ent|
       add ent
     end
   end
 
-  def standard_entries #(rbconfig)
-    rbconfig = @rbconfig
+  def standard_entries(rbconfig)
+    c = rbconfig
 
-    rubypath = File.join(rbconfig['bindir'], rbconfig['ruby_install_name'] + rbconfig['EXEEXT'])
+    rubypath = File.join(c['bindir'], c['ruby_install_name'] + c['EXEEXT'])
 
-    major = rbconfig['MAJOR'].to_i
-    minor = rbconfig['MINOR'].to_i
-    teeny = rbconfig['TEENY'].to_i
+    major = c['MAJOR'].to_i
+    minor = c['MINOR'].to_i
+    teeny = c['TEENY'].to_i
     version = "#{major}.#{minor}"
 
-# CHANGE Do not need to support these old versions any more.
-
-#     # ruby ver. >= 1.4.4?
-#     newpath_p = ((major >= 2) or
-#                  ((major == 1) and
-#                   ((minor >= 5) or
-#                    ((minor == 4) and (teeny >= 4)))))
+    # ruby ver. >= 1.4.4?
+    newpath_p = ((major >= 2) or
+                 ((major == 1) and
+                  ((minor >= 5) or
+                   ((minor == 4) and (teeny >= 4)))))
 
-    #if c['rubylibdir']
+    if c['rubylibdir']
       # V > 1.6.3
-
-      root            = '/'
-      prefix          = rbconfig['prefix']
-
-      libruby         = "#{prefix}/lib/ruby"
-      librubyver      = rbconfig['rubylibdir']
-      librubyverarch  = rbconfig['archdir']
-      siteruby        = rbconfig['sitedir']
-      siterubyver     = rbconfig['sitelibdir']
-      siterubyverarch = rbconfig['sitearchdir']
-
-      bindir          = paramize(rbconfig['bindir'])
-      libdir          = paramize(rbconfig['libdir'])
-      datadir         = paramize(rbconfig['datadir'])
-      mandir          = paramize(rbconfig['mandir'])
-      sysconfdir      = paramize(rbconfig['sysconfdir'])
-      localstatedir   = paramize(rbconfig['localstatedir'])
-
-#     elsif newpath_p
-#       # 1.4.4 <= V <= 1.6.3
-#       libruby         = "#{c['prefix']}/lib/ruby"
-#       librubyver      = "#{c['prefix']}/lib/ruby/#{version}"
-#       librubyverarch  = "#{c['prefix']}/lib/ruby/#{version}/#{c['arch']}"
-#       siteruby        = c['sitedir']
-#       siterubyver     = "$siteruby/#{version}"
-#       siterubyverarch = "$siterubyver/#{c['arch']}"
-#     else
-#       # V < 1.4.4
-#       libruby         = "#{c['prefix']}/lib/ruby"
-#       librubyver      = "#{c['prefix']}/lib/ruby/#{version}"
-#       librubyverarch  = "#{c['prefix']}/lib/ruby/#{version}/#{c['arch']}"
-#       siteruby        = "#{c['prefix']}/lib/ruby/#{version}/site_ruby"
-#       siterubyver     = siteruby
-#       siterubyverarch = "$siterubyver/#{c['arch']}"
-#     end
-
+      libruby         = "#{c['prefix']}/lib/ruby"
+      librubyver      = c['rubylibdir']
+      librubyverarch  = c['archdir']
+      siteruby        = c['sitedir']
+      siterubyver     = c['sitelibdir']
+      siterubyverarch = c['sitearchdir']
+    elsif newpath_p
+      # 1.4.4 <= V <= 1.6.3
+      libruby         = "#{c['prefix']}/lib/ruby"
+      librubyver      = "#{c['prefix']}/lib/ruby/#{version}"
+      librubyverarch  = "#{c['prefix']}/lib/ruby/#{version}/#{c['arch']}"
+      siteruby        = c['sitedir']
+      siterubyver     = "$siteruby/#{version}"
+      siterubyverarch = "$siterubyver/#{c['arch']}"
+    else
+      # V < 1.4.4
+      libruby         = "#{c['prefix']}/lib/ruby"
+      librubyver      = "#{c['prefix']}/lib/ruby/#{version}"
+      librubyverarch  = "#{c['prefix']}/lib/ruby/#{version}/#{c['arch']}"
+      siteruby        = "#{c['prefix']}/lib/ruby/#{version}/site_ruby"
+      siterubyver     = siteruby
+      siterubyverarch = "$siterubyver/#{c['arch']}"
+    end
     parameterize = lambda {|path|
-      path.sub(/\A#{Regexp.quote(rbconfig['prefix'])}/, '$prefix')
+      path.sub(/\A#{Regexp.quote(c['prefix'])}/, '$prefix')
     }
 
-    if arg = rbconfig['configure_args'].split.detect {|arg| /--with-make-prog=/ =~ arg }
+    if arg = c['configure_args'].split.detect {|arg| /--with-make-prog=/ =~ arg }
       makeprog = arg.sub(/'/, '').split(/=/, 2)[1]
     else
       makeprog = 'make'
     end
 
-    installdir_lambda = lambda {|val, table|
-      case val
-      when 'std'
-        table['rbdir'] = '$librubyver'
-        table['sodir'] = '$librubyverarch'
-      when 'site'
-        table['rbdir'] = '$siterubyver'
-        table['sodir'] = '$siterubyverarch'
-      when 'home'
-        setup_rb_error '$HOME was not set' unless ENV['HOME']
-        table['prefix'] = ENV['HOME']
-        table['rbdir'] = '$libdir/ruby'
-        table['sodir'] = '$libdir/ruby'
-      end
-    }
-
     [
-      ExecItem.new('installdirs', 'std/site/home', 'install under libruby, site_ruby or $HOME respectively', &installdir_lambda),
-      PathItem.new('root',            'path', root,               'root destination directory'),
-      PathItem.new('prefix',          'path', prefix,             'path prefix of target environment'),
-      PathItem.new('bindir',          'path', bindir,             'the directory for commands'),
-      PathItem.new('libdir',          'path', libdir,             'the directory for libraries'),
-      PathItem.new('datadir',         'path', datadir,            'the directory for shared data'),
-      PathItem.new('mandir',          'path', mandir,             'the directory for man pages'),
-      PathItem.new('sysconfdir',      'path', sysconfdir,         'the directory for system configuration files'),
-      PathItem.new('localstatedir',   'path', localstatedir,      'the directory for local state data'),
-      PathItem.new('libruby',         'path', libruby,            'the directory for ruby libraries'),
-      PathItem.new('librubyver',      'path', librubyver,         'the directory for standard ruby libraries'),
-      PathItem.new('librubyverarch',  'path', librubyverarch,     'the directory for standard ruby extensions'),
-      PathItem.new('siteruby',        'path', siteruby,           'the directory for version-independent aux ruby libraries'),
-      PathItem.new('siterubyver',     'path', siterubyver,        'the directory for aux ruby libraries'),
-      PathItem.new('siterubyverarch', 'path', siterubyverarch,    'the directory for aux ruby binaries'),
-      PathItem.new('rbdir',           'path', '$siterubyver',     'the directory for ruby scripts'),
-      PathItem.new('sodir',           'path', '$siterubyverarch', 'the directory for ruby extentions'),
-      PathItem.new('rubypath',        'path', rubypath,           'the path to set to #! line'),
-      ProgramItem.new('rubyprog',     'name', rubypath,           'the ruby program using for installation'),
-      ProgramItem.new('makeprog',     'name', makeprog,           'the make program to compile ruby extentions'),
-      SelectItem.new('shebang',       'all/ruby/never', 'ruby',   'shebang line (#!) editing mode'),
-      BoolItem.new('without-ext',     'yes/no',         'no',     'does not compile/install ruby extentions')
+      ExecItem.new('installdirs', 'std/site/home',
+                   'std: install under libruby; site: install under site_ruby; home: install under $HOME')\
+          {|val, table|
+            case val
+            when 'std'
+              table['rbdir'] = '$librubyver'
+              table['sodir'] = '$librubyverarch'
+            when 'site'
+              table['rbdir'] = '$siterubyver'
+              table['sodir'] = '$siterubyverarch'
+            when 'home'
+              setup_rb_error '$HOME was not set' unless ENV['HOME']
+              table['prefix'] = ENV['HOME']
+              table['rbdir'] = '$libdir/ruby'
+              table['sodir'] = '$libdir/ruby'
+            end
+          },
+      PathItem.new('prefix', 'path', c['prefix'],
+                   'path prefix of target environment'),
+      PathItem.new('bindir', 'path', parameterize.call(c['bindir']),
+                   'the directory for commands'),
+      PathItem.new('libdir', 'path', parameterize.call(c['libdir']),
+                   'the directory for libraries'),
+      PathItem.new('datadir', 'path', parameterize.call(c['datadir']),
+                   'the directory for shared data'),
+      PathItem.new('mandir', 'path', parameterize.call(c['mandir']),
+                   'the directory for man pages'),
+      PathItem.new('sysconfdir', 'path', parameterize.call(c['sysconfdir']),
+                   'the directory for system configuration files'),
+      PathItem.new('localstatedir', 'path', parameterize.call(c['localstatedir']),
+                   'the directory for local state data'),
+      PathItem.new('libruby', 'path', libruby,
+                   'the directory for ruby libraries'),
+      PathItem.new('librubyver', 'path', librubyver,
+                   'the directory for standard ruby libraries'),
+      PathItem.new('librubyverarch', 'path', librubyverarch,
+                   'the directory for standard ruby extensions'),
+      PathItem.new('siteruby', 'path', siteruby,
+          'the directory for version-independent aux ruby libraries'),
+      PathItem.new('siterubyver', 'path', siterubyver,
+                   'the directory for aux ruby libraries'),
+      PathItem.new('siterubyverarch', 'path', siterubyverarch,
+                   'the directory for aux ruby binaries'),
+      PathItem.new('rbdir', 'path', '$siterubyver',
+                   'the directory for ruby scripts'),
+      PathItem.new('sodir', 'path', '$siterubyverarch',
+                   'the directory for ruby extentions'),
+      PathItem.new('rubypath', 'path', rubypath,
+                   'the path to set to #! line'),
+      ProgramItem.new('rubyprog', 'name', rubypath,
+                      'the ruby program using for installation'),
+      ProgramItem.new('makeprog', 'name', makeprog,
+                      'the make program to compile ruby extentions'),
+      SelectItem.new('shebang', 'all/ruby/never', 'ruby',
+                     'shebang line (#!) editing mode'),
+      BoolItem.new('without-ext', 'yes/no', 'no',
+                   'does not compile/install ruby extentions')
     ]
   end
   private :standard_entries
 
-  def paramize( path )
-    path.sub(/\A#{Regexp.quote(@rbconfig['prefix'])}/, '$prefix')
-  end
-  private :paramize
-
   def load_multipackage_entries
     multipackage_entries().each do |ent|
       add ent
@@ -288,8 +294,10 @@ class ConfigTable
 
   def multipackage_entries
     [
-      PackageSelectionItem.new('with',    'name,name...', '', 'ALL',  'package names that you want to install'),
-      PackageSelectionItem.new('without', 'name,name...', '', 'NONE', 'package names that you do not want to install')
+      PackageSelectionItem.new('with', 'name,name...', '', 'ALL',
+                               'package names that you want to install'),
+      PackageSelectionItem.new('without', 'name,name...', '', 'NONE',
+                               'package names that you do not want to install')
     ]
   end
   private :multipackage_entries
@@ -354,8 +362,13 @@ class ConfigTable
       "--#{@name}=#{@template}"
     end
 
-    def value? ; true   ; end
-    def value  ; @value ; end
+    def value?
+      true
+    end
+
+    def value
+      @value
+    end
 
     def resolve(table)
       @value.gsub(%r<\$([^/]+)>) { table[$1] }
@@ -374,7 +387,9 @@ class ConfigTable
   end
 
   class BoolItem < Item
-    def config_type() 'bool' end
+    def config_type
+      'bool'
+    end
 
     def help_opt
       "--#{@name}"
@@ -394,9 +409,12 @@ class ConfigTable
   end
 
   class PathItem < Item
-    def config_type()  'path'  end
+    def config_type
+      'path'
+    end
 
     private
+
     def check(path)
       setup_rb_error "config: --#{@name} requires argument"  unless path
       path[0,1] == '$' ? path : File.expand_path(path)
@@ -404,7 +422,9 @@ class ConfigTable
   end
 
   class ProgramItem < Item
-    def config_type()  'program'  end
+    def config_type
+      'program'
+    end
   end
 
   class SelectItem < Item
@@ -413,9 +433,12 @@ class ConfigTable
       @ok = selection.split('/')
     end
 
-    def config_type()  'select'  end
+    def config_type
+      'select'
+    end
 
     private
+
     def check(val)
       unless @ok.include?(val.strip)
         setup_rb_error "config: use --#{@name}=#{@template} (#{val})"
@@ -469,7 +492,7 @@ class ConfigTable
     private
 
     def check(val)
-      unless File.dir?("packages/#{val}")
+      unless File.dir?("#{PACKAGES_DIRECTORY}/#{val}")
         setup_rb_error "config: no such package: #{val}"
       end
       val
@@ -542,9 +565,7 @@ end   # class ConfigTable
 module FileOperations
 
   def mkdir_p(dirname, prefix = nil)
-    dirname = File.join(prefix, File.expand_path(dirname)) if prefix
-    dirname = File.join( $setup_install_root, dirname ) if $setup_install_root
-
+    dirname = prefix + File.expand_path(dirname) if prefix
     $stderr.puts "mkdir -p #{dirname}" if verbose?
     return if no_harm?
 
@@ -628,15 +649,11 @@ module FileOperations
   end
 
   def install(from, dest, mode, prefix = nil)
-
-    realdest = prefix ? File.join(prefix, File.expand_path(dest)) : dest
-    realdest = File.join($setup_install_root, File.expand_path(realdest)) if $setup_install_root
-
     $stderr.puts "install #{from} #{dest}" if verbose?
     return if no_harm?
 
+    realdest = prefix ? prefix + File.expand_path(dest) : dest
     realdest = File.join(realdest, File.basename(from)) if File.dir?(realdest)
-
     str = File.binread(from)
     if diff?(str, realdest)
       verbose_off {
@@ -647,11 +664,7 @@ module FileOperations
       }
       File.chmod mode, realdest
 
-      # Do not make InstalledFiles entry if to alternate root.
-      # This prevents problem with root permissions on this file.
-      return true unless $setup_install_root
-
-      File.open("#{objdir_root()}/InstalledFiles", 'a') {|f|
+      File.open("#{objdir_root()}/#{INSTALLED_MANIFEST}", 'a') {|f|
         if prefix
           f.puts realdest.sub(prefix, '')
         else
@@ -715,14 +728,33 @@ module HookScriptAPI
     @config[key] = val
   end
 
+  #
   # srcdir/objdir (works only in the package directory)
+  #
 
-  def curr_srcdir()        "#{srcdir_root()}/#{relpath()}"  end
-  def curr_objdir()        "#{objdir_root()}/#{relpath()}"  end
-  def srcfile(path)        "#{curr_srcdir()}/#{path}"       end
-  def srcexist?(path)      File.exist?(srcfile(path))       end
-  def srcdirectory?(path)  File.dir?(srcfile(path))         end
-  def srcfile?(path)       File.file?(srcfile(path))        end
+  def curr_srcdir
+    "#{srcdir_root()}/#{relpath()}"
+  end
+
+  def curr_objdir
+    "#{objdir_root()}/#{relpath()}"
+  end
+
+  def srcfile(path)
+    "#{curr_srcdir()}/#{path}"
+  end
+
+  def srcexist?(path)
+    File.exist?(srcfile(path))
+  end
+
+  def srcdirectory?(path)
+    File.dir?(srcfile(path))
+  end
+
+  def srcfile?(path)
+    File.file?(srcfile(path))
+  end
 
   def srcentries(path = '.')
     Dir.open("#{curr_srcdir()}/#{path}") {|d|
@@ -761,20 +793,22 @@ class ToplevelInstaller
     [ 'distclean',"does `make distclean' for each extention" ]
   ]
 
-  def self.invoke
-    config = ConfigTable.new(load_rbconfig)
+  def ToplevelInstaller.invoke
+    config = ConfigTable.new(load_rbconfig())
     config.load_standard_entries
     config.load_multipackage_entries if multipackage?
     config.fixup
     klass = (multipackage?() ? ToplevelInstallerMulti : ToplevelInstaller)
-    klass.new(File.dirname($0), config).invoke
+    #klass.new(File.dirname($0), config).invoke
+    klass.new(ROOT_DIRECTORY, config).invoke
   end
 
-  def self.multipackage?
-    File.dir?(File.dirname($0) + '/packages')
+  def ToplevelInstaller.multipackage?
+    #File.dir?(File.dirname($0) + '/#{PACKAGES_DIRECTORY}')
+    File.dir?(ROOT_DIRECTORY + "/#{PACKAGES_DIRECTORY}")
   end
 
-  def self.load_rbconfig
+  def ToplevelInstaller.load_rbconfig
     if arg = ARGV.detect {|arg| /\A--rbconfig=/ =~ arg }
       ARGV.delete(arg)
       load File.expand_path(arg.split(/=/, 2)[1])
@@ -785,7 +819,6 @@ class ToplevelInstaller
     ::Config::CONFIG
   end
 
-
   def initialize(ardir_root, config)
     @ardir = File.expand_path(ardir_root)
     @config = config
@@ -837,9 +870,17 @@ class ToplevelInstaller
   # Hook Script API bases
   #
 
-  def srcdir_root()  @ardir  end
-  def objdir_root()  '.'     end
-  def relpath()      '.'     end
+  def srcdir_root
+    @ardir
+  end
+
+  def objdir_root
+    '.'
+  end
+
+  def relpath
+    '.'
+  end
 
   #
   # Option Parsing
@@ -969,7 +1010,6 @@ class ToplevelInstaller
     out.puts
     out.puts 'Options for INSTALL:'
     out.printf fmt, '--no-harm', 'only display what to do if given', 'off'
-    out.printf fmt, '--root=path',  'install root directory (effects all paths)', '/'
     out.printf fmt, '--prefix=path',  'install path prefix', ''
     out.puts
   end
@@ -1018,7 +1058,7 @@ class ToplevelInstallerMulti < ToplevelInstaller
 
   def initialize(ardir_root, config)
     super
-    @packages = directories_of("#{@ardir}/packages")
+    @packages = directories_of("#{@ardir}/#{PACKAGES_DIRECTORY}")
     raise 'no package exists' if @packages.empty?
     @root_installer = Installer.new(@config, @ardir, File.expand_path('.'))
   end
@@ -1026,7 +1066,7 @@ class ToplevelInstallerMulti < ToplevelInstaller
   def run_metaconfigs
     @config.load_script "#{@ardir}/metaconfig", self
     @packages.each do |name|
-      @config.load_script "#{@ardir}/packages/#{name}/metaconfig"
+      @config.load_script "#{@ardir}/#{PACKAGES_DIRECTORY}/#{name}/metaconfig"
     end
   end
 
@@ -1035,8 +1075,8 @@ class ToplevelInstallerMulti < ToplevelInstaller
   def packages=(list)
     raise 'package list is empty' if list.empty?
     list.each do |name|
-      raise "directory packages/#{name} does not exist"\
-              unless File.dir?("#{@ardir}/packages/#{name}")
+      raise "directory #{PACKAGES_DIRECTORY}/#{name} does not exist"\
+              unless File.dir?("#{@ardir}/#{PACKAGES_DIRECTORY}/#{name}")
     end
     @packages = list
   end
@@ -1045,8 +1085,8 @@ class ToplevelInstallerMulti < ToplevelInstaller
     @installers = {}
     @packages.each do |pack|
       @installers[pack] = Installer.new(@config,
-                                       "#{@ardir}/packages/#{pack}",
-                                       "packages/#{pack}")
+                                       "#{@ardir}/#{PACKAGES_DIRECTORY}/#{pack}",
+                                       "#{PACKAGES_DIRECTORY}/#{pack}")
     end
     with    = extract_selection(config('with'))
     without = extract_selection(config('without'))
@@ -1119,11 +1159,11 @@ class ToplevelInstallerMulti < ToplevelInstaller
   #
 
   def each_selected_installers
-    Dir.mkdir 'packages' unless File.dir?('packages')
+    Dir.mkdir PACKAGES_DIRECTORY unless File.dir?(PACKAGES_DIRECTORY)
     @selected.each do |pack|
       $stderr.puts "Processing the package `#{pack}' ..." if verbose?
-      Dir.mkdir "packages/#{pack}" unless File.dir?("packages/#{pack}")
-      Dir.chdir "packages/#{pack}"
+      Dir.mkdir "#{PACKAGES_DIRECTORY}/#{pack}" unless File.dir?("#{PACKAGES_DIRECTORY}/#{pack}")
+      Dir.chdir "#{PACKAGES_DIRECTORY}/#{pack}"
       yield @installers[pack]
       Dir.chdir '../..'
     end
@@ -1164,15 +1204,24 @@ class Installer
     "#<#{self.class} #{File.basename(@srcdir)}>"
   end
 
-  def noop(rel) ; end
+  def noop(rel)
+  end
 
   #
   # Hook Script API base methods
   #
 
-  def srcdir_root()  @srcdir  end
-  def objdir_root()  @objdir  end
-  def relpath()      @currdir end
+  def srcdir_root
+    @srcdir
+  end
+
+  def objdir_root
+    @objdir
+  end
+
+  def relpath
+    @currdir
+  end
 
   #
   # Config Access
@@ -1320,7 +1369,7 @@ class Installer
   #
 
   def exec_install
-    rm_f 'InstalledFiles'
+    rm_f "#{INSTALLED_MANIFEST}"
     exec_task_traverse 'install'
   end
 
@@ -1355,7 +1404,6 @@ class Installer
 
   def install_files(list, dest, mode)
     mkdir_p dest, @config.install_prefix
-    #mkdir_p dest, offset_dir
     list.each do |fname|
       install fname, dest, mode, @config.install_prefix
     end
@@ -1387,7 +1435,7 @@ class Installer
   end
 
   # picked up many entries from cvs-1.11.1/src/ignore.c
-  JUNK_FILES = %w( 
+  JUNK_FILES = %w(
     core RCSLOG tags TAGS .make.state
     .nse_depinfo #* .#* cvslog.* ,* .del-* *.olb
     *~ *.old *.bak *.BAK *.orig *.rej _$* *$
@@ -1457,7 +1505,7 @@ class Installer
   def exec_clean
     exec_task_traverse 'clean'
     rm_f @config.savefile
-    rm_f 'InstalledFiles'
+    rm_f "#{INSTALLED_MANIFEST}"
   end
 
   alias clean_dir_bin noop
@@ -1478,7 +1526,7 @@ class Installer
   def exec_distclean
     exec_task_traverse 'distclean'
     rm_f @config.savefile
-    rm_f 'InstalledFiles'
+    rm_f "#{INSTALLED_MANIFEST}"
   end
 
   alias distclean_dir_bin noop