kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

configure.in: arch dependent header directory options

Browse source 
* configure.in (rubyarchhdrdir, sitearchhdrdir, vendorarchhdrdir): add
  options to customize architecture dependent header directories.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39108 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-02-06 08:32:58 +00:00
parent 29c214e4a0
commit 67db06ba97
4 changed files with 28 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,4 +1,7 @@
Wed Feb 6 17:32:51 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
Wed Feb 6 17:32:56 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (rubyarchhdrdir, sitearchhdrdir, vendorarchhdrdir): add
options to customize architecture dependent header directories.
* configure.in (rubyarchprefix, sitearchdir, vendorarchdir): add
options to customize architecture dependent library directories.

21
configure.in
View file

@ -3339,19 +3339,40 @@ AC_ARG_WITH(rubyhdrdir,
[rubyhdrdir=$withval],
[rubyhdrdir='${includedir}/${RUBY_VERSION_NAME}'])
AC_ARG_WITH(rubyarchhdrdir,
AS_HELP_STRING([--with-arch-rubyhdrdir=DIR],
[architecture dependent core headers in DIR [[$(rubyhdrdir)/$(arch)]]]),
[rubyarchhdrdir=$withval],
[rubyarchhdrdir='${rubyhdrdir}/${arch}'])
AC_ARG_WITH(sitehdrdir,
AS_HELP_STRING([--with-sitehdrdir=DIR], [core site headers in DIR [[RUBYHDRDIR/site_ruby]]]),
[sitehdrdir=$withval],
[sitehdrdir='${rubyhdrdir}/site_ruby'])
AC_ARG_WITH(sitearchhdrdir,
AS_HELP_STRING([--with-arch-sitehdrdir=DIR],
[architecture dependent core site headers in DIR [[RUBYHDRDIR/site_ruby]]]),
[sitearchhdrdir=$withval],
[sitearchhdrdir='${sitehdrdir}/${sitearch}'])
AC_ARG_WITH(vendorhdrdir,
AS_HELP_STRING([--with-vendorhdrdir=DIR], [core vendor headers in DIR [[RUBYHDRDIR/vendor_ruby]]]),
[vendorhdrdir=$withval],
[vendorhdrdir='${rubyhdrdir}/vendor_ruby'])
AC_ARG_WITH(vendorarchhdrdir,
AS_HELP_STRING([--with-arch-vendorhdrdir=DIR],
[architecture dependent core vendor headers in DIR [[RUBYHDRDIR/vendor_ruby]]]),
[vendorarchhdrdir=$withval],
[vendorarchhdrdir='${vendorhdrdir}/${sitearch}'])
AC_SUBST(rubyhdrdir)dnl
AC_SUBST(sitehdrdir)dnl
AC_SUBST(vendorhdrdir)dnl
AC_SUBST(rubyarchhdrdir)dnl
AC_SUBST(sitearchhdrdir)dnl
AC_SUBST(vendorarchhdrdir)dnl
AC_ARG_WITH(mantype,
AS_HELP_STRING([--with-mantype=TYPE], [specify man page type; TYPE is one of man and doc]),

2
lib/mkmf.rb
View file

@ -229,7 +229,7 @@ module MakeMakefile
$hdrdir = CONFIG["rubyhdrdir"]
$topdir = $hdrdir
$top_srcdir = $hdrdir
$arch_hdrdir = "$(hdrdir)/$(arch)"
$arch_hdrdir = CONFIG["rubyarchhdrdir"]
elsif File.exist?(($hdrdir = ($top_srcdir ||= topdir) + "/include") + "/ruby.h")
$topdir ||= RbConfig::CONFIG["topdir"]
$arch_hdrdir = "$(extout)/include/$(arch)"

4
tool/rbinstall.rb
View file

@ -305,8 +305,8 @@ goruby_install_name = "go" + ruby_install_name
bindir = CONFIG["bindir", true]
libdir = CONFIG["libdir", true]
archhdrdir = rubyhdrdir = CONFIG["rubyhdrdir", true]
archhdrdir += "/" + CONFIG["arch", true]
rubyhdrdir = CONFIG["rubyhdrdir", true]
archhdrdir = CONFIG["rubyarchhdrdir"] || (rubyhdrdir + "/" + $arch)
rubylibdir = CONFIG["rubylibdir", true]
archlibdir = CONFIG["rubyarchdir", true]
sitelibdir = CONFIG["sitelibdir"]