diff options
Diffstat (limited to 'win32')
-rw-r--r-- | win32/Makefile.sub | 17 | ||||
-rwxr-xr-x | win32/configure.bat | 23 | ||||
-rw-r--r-- | win32/setup.mak | 3 |
3 files changed, 41 insertions, 2 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub index db37b65d0..5174b96fd 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -87,6 +87,13 @@ DESTDIR = $(prefix) !if !defined(libdir) libdir = $(exec_prefix)/lib !endif +!ifndef RIDATADIR +RIDATADIR = $(DESTDIR)/share/ri/$(MAJOR).$(MINOR)/system +!endif +!ifndef RDOCTARGET +RDOCTARGET = install-nodoc +!endif + !if !defined(CFLAGS) CFLAGS = -MD $(DEBUGFLAGS) $(OPTFLAGS) $(PROCESSOR_FLAG) !endif @@ -424,14 +431,20 @@ $(RUBYDEF): $(LIBRUBY_A) miniruby$(EXEEXT) {$(srcdir)/win32}.def.lib: $(AR) $(ARFLAGS)$@ -def:$< -install: rbconfig.rb +install: install-nodoc $(RDOCTARGET) + +install-nodoc: rbconfig.rb $(MINIRUBY) $(srcdir)/instruby.rb $(SCRIPT_ARGS) $(MINIRUBY) $(srcdir)/ext/extmk.rb $(SCRIPT_ARGS) install what-where no-install: rbconfig.rb - $(MINIRUBY) $(srcdir)/instruby.rb -n $(SCRIPT_ARGS) + $(MINIRUBY) $(srcdir)/instruby.rb -n $(SCRIPT_ARGS) --mantype="$(MANTYPE)" $(MINIRUBY) $(srcdir)/ext/extmk.rb -n $(SCRIPT_ARGS) install +install-doc: + @echo Generating RDoc documentation + $(DESTDIR:/=\)\bin\$(PROGRAM) $(srcdir)/bin/rdoc --all --ri-system --op "$(RIDATADIR)" $(srcdir) + clean: clean-ext clean-local clean-local: diff --git a/win32/configure.bat b/win32/configure.bat index 33dd89307..97a8945c4 100755 --- a/win32/configure.bat +++ b/win32/configure.bat @@ -14,6 +14,10 @@ if "%1" == "--srcdir" goto :srcdir if "%1" == "srcdir" goto :srcdir
if "%1" == "--target" goto :target
if "%1" == "target" goto :target
+if "%1" == "--enable-install-doc" goto :enable-rdoc
+if "%1" == "--disable-install-doc" goto :disable-rdoc
+if "%1" == "-h" goto :help
+if "%1" == "--help" goto :help
echo>> ~tmp~.mak "%1" \
shift
goto :loop
@@ -27,6 +31,25 @@ goto :loop shift
shift
goto :loop
+:enable-rdoc
+ echo>> ~tmp~.mak "RDOCTARGET=install-doc" \
+ shift
+goto :loop
+:disable-rdoc
+ echo>> ~tmp~.mak "RDOCTARGET=install-nodoc" \
+ shift
+goto :loop
+:help
+ echo Configuration:
+ echo --help display this help
+ echo --srcdir=DIR find the sources in DIR [configure dir or `..']
+ echo System types:
+ echo --target=TARGET configure for TARGET [i386-mswin32]
+ echo Optional Package:
+ echo --enable-install-doc install rdoc indexes during install
+ del ~tmp~.mak
+goto :exit
:end
echo>> ~tmp~.mak WIN32DIR=$(@D)
nmake -alf ~tmp~.mak
+:exit
diff --git a/win32/setup.mak b/win32/setup.mak index 9c4616ccb..5e2ea21e5 100644 --- a/win32/setup.mak +++ b/win32/setup.mak @@ -32,6 +32,9 @@ alpha-$(OS): -prologue- -alpha- -epilogue- @type << > $(MAKEFILE) ### Makefile for ruby $(OS) ### srcdir = $(srcdir:\=/) +!if defined(RDOCTARGET) +RDOCTARGET = $(RDOCTARGET) +!endif << @cl -nologo -EP -I$(srcdir) -DRUBY_EXTERN="//" <<"Creating $(MAKEFILE)" >> $(MAKEFILE) #include "version.h" |