diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2021-03-30 23:28:49 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-30 23:28:49 +0900 |
| commit | 5cdf99f64e344b8e4638824d55f5caf33be682ca (patch) | |
| tree | cc1a89a5b2583d6b81f9426aefa284a970ebdc62 /lib | |
| parent | 9713acd731309647b901825ee48af35984a9b4b8 (diff) | |
mkmf: fixed install directories of header files in extension libraries [Bug #17761]
When installing an extension library which provides a header, that
header should be installed under site_ruby (or vendor_ruby when
"--vendor" option was given to extconf.rb). However, currently
this file is about to be installed in the core include directory.
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/4339
Merged-By: nobu <nobu@ruby-lang.org>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mkmf.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 1ae99257ce..01f240194e 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -207,8 +207,8 @@ module MakeMakefile ['RUBYCOMMONDIR', '$(vendordir)$(target_prefix)'], ['RUBYLIBDIR', '$(vendorlibdir)$(target_prefix)'], ['RUBYARCHDIR', '$(vendorarchdir)$(target_prefix)'], - ['HDRDIR', '$(rubyhdrdir)/ruby$(target_prefix)'], - ['ARCHHDRDIR', '$(rubyhdrdir)/$(arch)/ruby$(target_prefix)'], + ['HDRDIR', '$(vendorhdrdir)$(target_prefix)'], + ['ARCHHDRDIR', '$(vendorarchhdrdir)$(target_prefix)'], ] else dirs = [ @@ -216,8 +216,8 @@ module MakeMakefile ['RUBYCOMMONDIR', '$(sitedir)$(target_prefix)'], ['RUBYLIBDIR', '$(sitelibdir)$(target_prefix)'], ['RUBYARCHDIR', '$(sitearchdir)$(target_prefix)'], - ['HDRDIR', '$(rubyhdrdir)/ruby$(target_prefix)'], - ['ARCHHDRDIR', '$(rubyhdrdir)/$(arch)/ruby$(target_prefix)'], + ['HDRDIR', '$(sitehdrdir)$(target_prefix)'], + ['ARCHHDRDIR', '$(sitearchhdrdir)$(target_prefix)'], ] end dirs << ['target_prefix', (target_prefix ? "/#{target_prefix}" : "")] |