summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-03-01 10:56:26 +0000
committerocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-03-01 10:56:26 +0000
commitc2f7a5eec33efabd73568c9fa0b2366663751b58 (patch)
tree6ff91334c5d1d0c045d2ba384957b5c33f6e7b09
parent6155d9dad8126e5ef48719fb95f2005e68fda275 (diff)
downloadruby-c2f7a5eec33efabd73568c9fa0b2366663751b58.tar.gz
ruby-c2f7a5eec33efabd73568c9fa0b2366663751b58.tar.xz
ruby-c2f7a5eec33efabd73568c9fa0b2366663751b58.zip
* bcc32/setup.mak: configure's default is "--enable-install-doc"
* win32/setup.mak: ditto. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@5858 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--bcc32/setup.mak2
-rw-r--r--win32/setup.mak2
3 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 2262eb1a3..5569817d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Mar 1 19:42:05 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+
+ * bcc32/setup.mak: configure's default is "--enable-install-doc"
+
Mon Mar 1 12:24:10 2004 Dave Thomas <dave@pragprog.com>
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_alias):
diff --git a/bcc32/setup.mak b/bcc32/setup.mak
index 8995f1302..abce40dd8 100644
--- a/bcc32/setup.mak
+++ b/bcc32/setup.mak
@@ -37,7 +37,9 @@ alpha-$(OS): -prologue- -alpha- -epilogue-
srcdir = $(srcdir:\=/)
prefix = $(prefix:\=/)
EXTSTATIC = $(EXTSTATIC)
+!if defined(RDOCTARGET)
RDOCTARGET = $(RDOCTARGET)
+!endif
|
@cpp32 -I$(srcdir) -P- -o$(MAKEFILE) > nul &&|
\#include "version.h"
diff --git a/win32/setup.mak b/win32/setup.mak
index 124bff48b..30132e087 100644
--- a/win32/setup.mak
+++ b/win32/setup.mak
@@ -37,7 +37,9 @@ alpha-$(OS): -prologue- -alpha- -epilogue-
srcdir = $(srcdir:\=/)
prefix = $(prefix:\=/)
EXTSTATIC = $(EXTSTATIC)
+!if defined(RDOCTARGET)
RDOCTARGET = $(RDOCTARGET)
+!endif
<<
@cl -nologo -EP -I$(srcdir) <<"Creating $(MAKEFILE)" >> $(MAKEFILE)
#include "version.h"