diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-11-03 13:30:59 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-11-03 13:30:59 +0000 |
| commit | 9435853daf0cdc9400cd1dceb8b38cd83a81efaa (patch) | |
| tree | 686394b4a1a401f7a835416d98b5acf609713d40 | |
| parent | 21eebfb086c3feb30bc59a11299da6d74ec92e81 (diff) | |
| download | ruby-9435853daf0cdc9400cd1dceb8b38cd83a81efaa.tar.gz | |
* configure.in: --with-vendor-hdrdir implemented.
* lib/mkmf.rb: check --vendor argument.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13807 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.in | 6 | ||||
| -rw-r--r-- | lib/mkmf.rb | 15 |
3 files changed, 27 insertions, 0 deletions
@@ -1,3 +1,9 @@ +Sat Nov 3 22:29:35 2007 Tanaka Akira <akr@fsij.org> + + * configure.in: --with-vendor-hdrdir implemented. + + * lib/mkmf.rb: check --vendor argument. + Sat Nov 3 20:30:48 2007 Tanaka Akira <akr@fsij.org> * configure.in: --with-vendordir implemented. diff --git a/configure.in b/configure.in index 4ee99c44fb..7af004a5d1 100644 --- a/configure.in +++ b/configure.in @@ -1657,8 +1657,14 @@ AC_ARG_WITH(sitehdrdir, [sitehdrdir=$withval], [sitehdrdir='${rubyhdrdir}/site_ruby']) +AC_ARG_WITH(vendorhdrdir, + [ --with-vendor-hdrdir=DIR core headers in DIR [INCLUDEDIR]], + [vendorhdrdir=$withval], + [vendorhdrdir='${rubyhdrdir}/vendor_ruby']) + AC_SUBST(rubyhdrdir)dnl AC_SUBST(sitehdrdir)dnl +AC_SUBST(vendorhdrdir)dnl AC_ARG_WITH(mantype, [ --with-mantype=TYPE specify man page type; TYPE is one of man and doc], diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 73014cdf07..51cdd4ee3f 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -51,6 +51,9 @@ $archdir = CONFIG["archdir"] $sitedir = CONFIG["sitedir"] $sitelibdir = CONFIG["sitelibdir"] $sitearchdir = CONFIG["sitearchdir"] +$vendordir = CONFIG["vendordir"] +$vendorlibdir = CONFIG["vendorlibdir"] +$vendorarchdir = CONFIG["vendorarchdir"] $mswin = /mswin/ =~ RUBY_PLATFORM $bccwin = /bccwin/ =~ RUBY_PLATFORM @@ -74,12 +77,16 @@ end INSTALL_DIRS = [ [dir_re('commondir'), "$(RUBYCOMMONDIR)"], [dir_re('sitedir'), "$(RUBYCOMMONDIR)"], + [dir_re('vendordir'), "$(RUBYCOMMONDIR)"], [dir_re('rubylibdir'), "$(RUBYLIBDIR)"], [dir_re('archdir'), "$(RUBYARCHDIR)"], [dir_re('sitelibdir'), "$(RUBYLIBDIR)"], + [dir_re('vendorlibdir'), "$(RUBYLIBDIR)"], [dir_re('sitearchdir'), "$(RUBYARCHDIR)"], + [dir_re('vendorarchdir'), "$(RUBYARCHDIR)"], [dir_re('rubyhdrdir'), "$(RUBYHDRDIR)"], [dir_re('sitehdrdir'), "$(SITEHDRDIR)"], + [dir_re('vendorhdrdir'), "$(VENDORHDRDIR)"], ] def install_dirs(target_prefix = nil) @@ -101,6 +108,14 @@ def install_dirs(target_prefix = nil) ['HDRDIR', '$(rubyhdrdir)/ruby$(target_prefix)'], ['ARCHHDRDIR', '$(rubyhdrdir)/$(arch)/ruby$(target_prefix)'], ] + elsif $configure_args.has_key?('--vendor') + dirs = [ + ['RUBYCOMMONDIR', '$(vendordir)$(target_prefix)'], + ['RUBYLIBDIR', '$(vendorlibdir)$(target_prefix)'], + ['RUBYARCHDIR', '$(vendorarchdir)$(target_prefix)'], + ['HDRDIR', '$(rubyhdrdir)/ruby$(target_prefix)'], + ['ARCHHDRDIR', '$(rubyhdrdir)/$(arch)/ruby$(target_prefix)'], + ] else dirs = [ ['RUBYCOMMONDIR', '$(sitedir)$(target_prefix)'], |