ViewVC Help
View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing
root/repos/RubyInstaller/GNUmakefile
(Generate patch)

Comparing RubyInstaller/GNUmakefile (file contents):
Revision 1093 by douglas, 2008-09-23T04:08:13-07:00 vs.
Revision 1094 by douglas, 2008-09-26T04:36:42-07:00

# Line 5 | Line 5
5   # $Id$
6  
7   ifeq ($(OS),Windows_NT)
8 < BASE := $(CURDIR)
8 > BASE := $(CURDIR)/ruby
9   CP := C:\cygwin\bin\cp.exe
10   GEMS_INSTALL := gems-install.cmd
11   RM_F := del /F /A
12   RM_RF := rmdir /Q /S
13   TOUCH := touch.cmd
14   else
15 < BASE := Z:$(CURDIR)
15 > BASE := Z:$(CURDIR)/ruby
16   CP := cp
17   GEMS_INSTALL := ./gems-install.sh
18   RM_F := rm -f
# Line 45 | Line 45 | all: $(INSTALLER)
45          unzip $(RUBY_ZIP) -d ruby
46          $(TOUCH) $@
47  
48 < .ruby-install: ruby/bin/libeay32.dll ruby/bin/ssleay32.dll ruby/bin/zlib.dll
48 > .ruby-install: ruby/bin/history.dll ruby/bin/libeay32.dll ruby/bin/history.dll \
49 >        ruby/bin/ssleay32.dll ruby/bin/zlib.dll
50          $(TOUCH) $@
51  
52 < $(INSTALLER): .gems-install
53 <        echo $(BASE)
52 > $(INSTALLER): ruby-installer.nsi .gems-install
53 >        makensis /DRUBY_VERSION=$(RUBY_VERSION) /DGEMS_VERSION=$(GEMS_VERSION) \
54 >                /DBASE=$(BASE) $<
55  
56   ruby/bin/%.dll: %.dll .ruby
57          $(CP) $< $@
58  
59 + ruby/bin/history.dll: history5.dll .ruby
60 +        $(CP) $< $@
61 +
62 + ruby/bin/readline.dll: readline5.dll .ruby
63 +        $(CP) $< $@
64 +
65   ruby/bin/zlib.dll: zlib1.dll .ruby
66          $(CP) $< $@
67  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines