* 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
This commit is contained in:
parent
21eebfb086
commit
9435853daf
|
@ -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>
|
Sat Nov 3 20:30:48 2007 Tanaka Akira <akr@fsij.org>
|
||||||
|
|
||||||
* configure.in: --with-vendordir implemented.
|
* configure.in: --with-vendordir implemented.
|
||||||
|
|
|
@ -1657,8 +1657,14 @@ AC_ARG_WITH(sitehdrdir,
|
||||||
[sitehdrdir=$withval],
|
[sitehdrdir=$withval],
|
||||||
[sitehdrdir='${rubyhdrdir}/site_ruby'])
|
[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(rubyhdrdir)dnl
|
||||||
AC_SUBST(sitehdrdir)dnl
|
AC_SUBST(sitehdrdir)dnl
|
||||||
|
AC_SUBST(vendorhdrdir)dnl
|
||||||
|
|
||||||
AC_ARG_WITH(mantype,
|
AC_ARG_WITH(mantype,
|
||||||
[ --with-mantype=TYPE specify man page type; TYPE is one of man and doc],
|
[ --with-mantype=TYPE specify man page type; TYPE is one of man and doc],
|
||||||
|
|
15
lib/mkmf.rb
15
lib/mkmf.rb
|
@ -51,6 +51,9 @@ $archdir = CONFIG["archdir"]
|
||||||
$sitedir = CONFIG["sitedir"]
|
$sitedir = CONFIG["sitedir"]
|
||||||
$sitelibdir = CONFIG["sitelibdir"]
|
$sitelibdir = CONFIG["sitelibdir"]
|
||||||
$sitearchdir = CONFIG["sitearchdir"]
|
$sitearchdir = CONFIG["sitearchdir"]
|
||||||
|
$vendordir = CONFIG["vendordir"]
|
||||||
|
$vendorlibdir = CONFIG["vendorlibdir"]
|
||||||
|
$vendorarchdir = CONFIG["vendorarchdir"]
|
||||||
|
|
||||||
$mswin = /mswin/ =~ RUBY_PLATFORM
|
$mswin = /mswin/ =~ RUBY_PLATFORM
|
||||||
$bccwin = /bccwin/ =~ RUBY_PLATFORM
|
$bccwin = /bccwin/ =~ RUBY_PLATFORM
|
||||||
|
@ -74,12 +77,16 @@ end
|
||||||
INSTALL_DIRS = [
|
INSTALL_DIRS = [
|
||||||
[dir_re('commondir'), "$(RUBYCOMMONDIR)"],
|
[dir_re('commondir'), "$(RUBYCOMMONDIR)"],
|
||||||
[dir_re('sitedir'), "$(RUBYCOMMONDIR)"],
|
[dir_re('sitedir'), "$(RUBYCOMMONDIR)"],
|
||||||
|
[dir_re('vendordir'), "$(RUBYCOMMONDIR)"],
|
||||||
[dir_re('rubylibdir'), "$(RUBYLIBDIR)"],
|
[dir_re('rubylibdir'), "$(RUBYLIBDIR)"],
|
||||||
[dir_re('archdir'), "$(RUBYARCHDIR)"],
|
[dir_re('archdir'), "$(RUBYARCHDIR)"],
|
||||||
[dir_re('sitelibdir'), "$(RUBYLIBDIR)"],
|
[dir_re('sitelibdir'), "$(RUBYLIBDIR)"],
|
||||||
|
[dir_re('vendorlibdir'), "$(RUBYLIBDIR)"],
|
||||||
[dir_re('sitearchdir'), "$(RUBYARCHDIR)"],
|
[dir_re('sitearchdir'), "$(RUBYARCHDIR)"],
|
||||||
|
[dir_re('vendorarchdir'), "$(RUBYARCHDIR)"],
|
||||||
[dir_re('rubyhdrdir'), "$(RUBYHDRDIR)"],
|
[dir_re('rubyhdrdir'), "$(RUBYHDRDIR)"],
|
||||||
[dir_re('sitehdrdir'), "$(SITEHDRDIR)"],
|
[dir_re('sitehdrdir'), "$(SITEHDRDIR)"],
|
||||||
|
[dir_re('vendorhdrdir'), "$(VENDORHDRDIR)"],
|
||||||
]
|
]
|
||||||
|
|
||||||
def install_dirs(target_prefix = nil)
|
def install_dirs(target_prefix = nil)
|
||||||
|
@ -101,6 +108,14 @@ def install_dirs(target_prefix = nil)
|
||||||
['HDRDIR', '$(rubyhdrdir)/ruby$(target_prefix)'],
|
['HDRDIR', '$(rubyhdrdir)/ruby$(target_prefix)'],
|
||||||
['ARCHHDRDIR', '$(rubyhdrdir)/$(arch)/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
|
else
|
||||||
dirs = [
|
dirs = [
|
||||||
['RUBYCOMMONDIR', '$(sitedir)$(target_prefix)'],
|
['RUBYCOMMONDIR', '$(sitedir)$(target_prefix)'],
|
||||||
|
|
Loading…
Reference in New Issue