about summary refs log tree commit homepage
path: root/GNUmakefile
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2009-11-28 12:42:31 -0800
committerEric Wong <normalperson@yhbt.net>2009-11-28 12:43:22 -0800
commit53624699c89c4529651153325b7e47696abb9788 (patch)
tree0b0ab55a2db2ffdce1b5423c4383c08582c248af /GNUmakefile
parent57fdb562754cad478fc36af175d4815b313242fc (diff)
downloadrainbows-53624699c89c4529651153325b7e47696abb9788.tar.gz
Diffstat (limited to 'GNUmakefile')
-rw-r--r--GNUmakefile16
1 files changed, 5 insertions, 11 deletions
diff --git a/GNUmakefile b/GNUmakefile
index 105241a..1b61fe0 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,19 +1,13 @@
 # use GNU Make to run tests in parallel, and without depending on RubyGems
 all::
 RUBY = ruby
-rake = rake
+RAKE = rake
 GIT_URL = git://git.bogomips.org/rainbows.git
 
 GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
         @./GIT-VERSION-GEN
 -include GIT-VERSION-FILE
 -include local.mk
-ifdef ruby
-  ifeq ($(RUBY),ruby)
-    $(warning ruby variable is deprecated, use RUBY instead)
-    RUBY = $(ruby)
-  endif
-endif
 ifeq ($(DLEXT),) # "so" for Linux
   DLEXT := $(shell $(RUBY) -rrbconfig -e 'puts Config::CONFIG["DLEXT"]')
 endif
@@ -61,7 +55,7 @@ manifest: $(pkg_extra) man
         $(RM) $@+
 
 NEWS: GIT-VERSION-FILE
-        $(rake) -s news_rdoc > $@+
+        $(RAKE) -s news_rdoc > $@+
         mv $@+ $@
 
 SINCE = 0.5.0
@@ -97,7 +91,7 @@ doc: .document NEWS ChangeLog
         $(RUBY) -i -p -e \
           '$$_.gsub!("</title>",%q{\&$(call atom,$(news_atom))})' \
           doc/NEWS.html doc/README.html
-        $(rake) -s news_atom > doc/NEWS.atom.xml
+        $(RAKE) -s news_atom > doc/NEWS.atom.xml
         cd doc && ln README.html tmp && mv tmp index.html
         $(MAKE) -C Documentation comparison.html
         $(RUBY) -i -p -e \
@@ -117,10 +111,10 @@ release_changes := release_changes-$(VERSION)
 release-notes: $(release_notes)
 release-changes: $(release_changes)
 $(release_changes):
-        $(rake) -s release_changes > $@+
+        $(RAKE) -s release_changes > $@+
         $(VISUAL) $@+ && test -s $@+ && mv $@+ $@
 $(release_notes):
-        GIT_URL=$(GIT_URL) $(rake) -s release_notes > $@+
+        GIT_URL=$(GIT_URL) $(RAKE) -s release_notes > $@+
         $(VISUAL) $@+ && test -s $@+ && mv $@+ $@
 
 # ensures we're actually on the tagged $(VERSION), only used for release