diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-12-28 17:25:31 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-12-28 17:25:31 +0000 |
| commit | 923b55d35b560d11f13eea802a0f246a3c908ae6 (patch) | |
| tree | 78f49d70fe2e0acd2a70e9a4c2fa062a858cf02f /win32/setup.mak | |
| parent | bb2030498a14f28686472fb93fe492192f48c606 (diff) | |
* instruby.rb: fix install directory if destdir and compile_dir are
not in the same drive.
* ext/extmk.rb: ditto.
* win32/Makefile.sub, win32/README.win32, win32/configure.bat,
win32/setup.mak: new configure scheme. use ``configure --prefix=dir''
instead of ``nmake DESTDIR=dir install''.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5336 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32/setup.mak')
| -rw-r--r-- | win32/setup.mak | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/win32/setup.mak b/win32/setup.mak index 5f243685ad..188b418b34 100644 --- a/win32/setup.mak +++ b/win32/setup.mak @@ -9,6 +9,9 @@ srcdir = $(WIN32DIR:/win32=) !else srcdir = $(WIN32DIR)/.. !endif +!if "$(prefix)" == "" +prefix = /usr +!endif OS = mswin32 RT = msvcrt INCLUDE = !include @@ -32,6 +35,7 @@ alpha-$(OS): -prologue- -alpha- -epilogue- @type << > $(MAKEFILE) ### Makefile for ruby $(OS) ### srcdir = $(srcdir:\=/) +prefix = $(prefix:\=/) << @cl -nologo -EP -I$(srcdir) <<"Creating $(MAKEFILE)" >> $(MAKEFILE) #include "version.h" @@ -73,7 +77,6 @@ $(CPU) = $(PROCESSOR_LEVEL) # RT = $(RT) # RUBY_INSTALL_NAME = ruby # RUBY_SO_NAME = $$(RT)-$$(RUBY_INSTALL_NAME)$$(MAJOR)$$(MINOR) -# prefix = /usr # CFLAGS = -nologo -MD $$(DEBUGFLAGS) $$(OPTFLAGS) $$(PROCESSOR_FLAG) # CPPFLAGS = -I. -I$$(srcdir) -I$$(srcdir)/missing -DLIBRUBY_SO=\"$$(LIBRUBY_SO)\" # STACK = 0x2000000 |