aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-05-05 04:29:01 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-05-05 04:29:01 +0000
commit36de5e4db5f1f9feb0c31085571713acf8a95428 (patch)
tree4edf356ad688a76c93cc0e24b454268c2d694f30
parentf259b8849ba527c2a6c3d85cb17a456d832d95f9 (diff)
downloadruby-36de5e4db5f1f9feb0c31085571713acf8a95428.tar.gz
ruby.pc.in: rubyarchhdrdir
* template/ruby.pc.in (Cflags): use rubyarchhdrdir for multiarch. [Bug #7874] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40580 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--template/ruby.pc.in5
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 9e407766b6..016c307ef5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun May 5 13:28:54 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * template/ruby.pc.in (Cflags): use rubyarchhdrdir for multiarch.
+ [Bug #7874]
+
Sat May 4 07:20:00 2013 Zachary Scott <zachary@zacharyscott.net>
* doc/security.rdoc: Add note about reporting security vulns
diff --git a/template/ruby.pc.in b/template/ruby.pc.in
index 4137d98cfc..8a2c066e9c 100644
--- a/template/ruby.pc.in
+++ b/template/ruby.pc.in
@@ -34,6 +34,9 @@ sitearchdir=@sitearchdir@
rubyhdrdir=@rubyhdrdir@
vendorhdrdir=@vendorhdrdir@
sitehdrdir=@sitehdrdir@
+rubyarchhdrdir=@rubyarchhdrdir@
+vendorarchhdrdir=@vendorarchhdrdir@
+sitearchhdrdir=@sitearchhdrdir@
LIBPATH=@LIBPATH@
LIBRUBY_A=@LIBRUBY_A@
LIBRUBY_SO=@LIBRUBY_SO@
@@ -48,6 +51,6 @@ Name: Ruby
Description: Object Oriented Script Language
Version: ${ruby_version}
URL: http://www.ruby-lang.org
-Cflags: -I${rubyhdrdir}/${arch} -I${rubyhdrdir}
+Cflags: -I${rubyarchhdrdir} -I${rubyhdrdir}
Libs: ${DLDFLAGS} ${LIBRUBYARG_SHARED} ${LIBS}
Requires: