From 8875ffc4120fd8ef273f1b584803bc83891ff23b Mon Sep 17 00:00:00 2001 From: yugui Date: Sat, 23 May 2009 16:07:46 +0000 Subject: * 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 --- bcc32/Makefile.sub | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'bcc32/Makefile.sub') diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub index 15e9669060..834e8a5870 100644 --- a/bcc32/Makefile.sub +++ b/bcc32/Makefile.sub @@ -114,9 +114,6 @@ datadir = $(prefix)/share !ifndef EXTOUT EXTOUT = .ext !endif -!ifndef RIDATADIR -RIDATADIR = $(DESTDIR)$(datadir)/ri/$(MAJOR).$(MINOR)/system -!endif !ifndef TESTUI TESTUI = console !endif @@ -397,6 +394,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-$(OS),;t t s,@build_alias@,$(CPU)-$(OS),;t t s,@build_cpu@,$(CPU),;t t -- cgit v1.2.3