diff options
author | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-06-12 07:08:08 +0000 |
---|---|---|
committer | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-06-12 07:08:08 +0000 |
commit | c3b81910196894e486fec0c0a5a1273fc35955ea (patch) | |
tree | 77c06d0b03f305be27236b5fa317158507c46295 /lib | |
parent | bccf874ceb648f8f680f79db2737c8592086c2af (diff) | |
download | ruby-c3b81910196894e486fec0c0a5a1273fc35955ea.tar.gz |
Update rdoc for pkg_config() and move :stopdoc: below to enable it.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41252 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r-- | lib/mkmf.rb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb index f6637b493d..48562aafe0 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1715,8 +1715,6 @@ SRC [idir, ldir] end - # :stopdoc: - # Returns compile/link information about an installed library in a # tuple of <code>[cflags, ldflags, libs]</code>, by using the # command found first in the following commands: @@ -1730,8 +1728,12 @@ SRC # # Where {option} is, for instance, <code>--cflags</code>. # + # The values obtained are appended to +$CFLAGS+, +$LDFLAGS+ and + # +$libs+. + # # If an <code>option</code> argument is given, the config command is - # invoked with the option and a stripped output string is returned. + # invoked with the option and a stripped output string is returned + # without modifying any of the global values mentioned above. def pkg_config(pkg, option=nil) if pkgconfig = with_config("#{pkg}-config") and find_executable0(pkgconfig) # iff package specific config command is given @@ -1765,6 +1767,8 @@ SRC end end + # :stopdoc: + def with_destdir(dir) return dir unless $extmk dir = dir.sub($dest_prefix_pattern, '') |