From 9197e00dda4e6f88b448d7eff26282ce89c16c6e Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Wed, 13 May 2015 10:50:48 -0400 Subject: setup.rb s/Config/RbConfig/ --- CHANGELOG | 2 ++ setup.rb | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 907f207..d523baf 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -9,6 +9,8 @@ Reverse Chronological: * sisu-markup-samples_7.1.0.orig.tar.xz (2015-05-15:19/5) [version follows sisu] http://git.sisudoc.org/gitweb/?p=doc/sisu-markup-samples.git;a=log;h=refs/tags/sisu-markup-samples_7.1.0 + * setup.rb s/Config/RbConfig/ + * CHANGELOG, clean up some cruft * sisu-markup-samples_5.0.2.orig.tar.xz (2014-08-07:26/2) diff --git a/setup.rb b/setup.rb index 424a5f3..65380f4 100644 --- a/setup.rb +++ b/setup.rb @@ -659,7 +659,7 @@ module FileOperations def ruby(*args) command config('rubyprog'), *args end - + def make(task = nil) command(*[config('makeprog'), task].compact) end @@ -722,7 +722,7 @@ module HookScriptAPI def srcdirectory?(path) File.dir?(srcfile(path)) end - + def srcfile?(path) File.file?(srcfile(path)) end @@ -785,7 +785,7 @@ class ToplevelInstaller else require 'rbconfig' end - ::Config::CONFIG + ::RbConfig::CONFIG end def initialize(ardir_root, config) @@ -826,7 +826,7 @@ class ToplevelInstaller __send__ "exec_#{task}" end end - + def run_metaconfigs @config.load_script "#{@ardir}/metaconfig" end @@ -1404,7 +1404,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 _$* *$ -- cgit v1.2.3