diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-05-23 16:07:46 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-05-23 16:07:46 +0000 |
| commit | 8875ffc4120fd8ef273f1b584803bc83891ff23b (patch) | |
| tree | d4649bd1559d94e2f442abbdf324feaa763bed29 /win32 | |
| parent | 803c0550439fadc86699fd193d541330f1503890 (diff) | |
* configure.in ($ridir): new configuration. [ruby-core:23520].
c.f. [ruby-core:23519].
(--with-ridir): new configure option.
* tool/instruby.rb (:doc, :rdoc): uses $ridir instead of
a fixed path.
* lib/rdoc/ri/paths.rb: follows $ridir.
* Makefile.in: removes RIDATADIR which is no longer used.
* bcc32/Makefile.sub: generates the 'ridir' entry for RbConfig.
removes RIDATADIR which is no longer used.
* win32/Makefile.sub: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23554 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile.sub | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub index c9b245508d..a85ea4a139 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -140,9 +140,6 @@ datadir = $(prefix)/share !ifndef EXTOUT EXTOUT = .ext !endif -!ifndef RIDATADIR -RIDATADIR = $(DESTDIR)$(datadir)/ri/$(MAJOR).$(MINOR)/system -!endif !ifndef TESTUI TESTUI = console !endif @@ -595,6 +592,7 @@ s,@includedir@,$${prefix}/include,;t t s,@oldincludedir@,/usr/include,;t t s,@infodir@,$${prefix}/info,;t t s,@mandir@,$${prefix}/man,;t t +s,@ridir@,$${prefix}/share/ri,;t t s,@build@,$(CPU)-pc-$(PLATFORM),;t t s,@build_alias@,$(CPU)-$(PLATFORM),;t t s,@build_cpu@,$(CPU),;t t |