Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim

remotes/origin/0.6.7-post-fixes
Justin Clark-Casey (justincc) 2009-09-03 19:10:04 +01:00
commit 87ec14c5dc
1 changed files with 12 additions and 2 deletions

View File

@ -1,4 +1,14 @@
NANT = $(shell if test "$$EMACS" = "t" ; then echo "nant"; else echo "./nant-color"; fi) # hey, emacs! this is a -*- makefile -*-
#
# OpenSim makefile
#
RUBY = $(strip $(shell which ruby 2>/dev/null))
ifeq ($(RUBY),)
NANT = nant
else
NANT = $(shell if test "$$EMACS" = "t" ; then echo "nant"; else echo "./nant-color"; fi)
endif
all: prebuild all: prebuild
# @export PATH=/usr/local/bin:$(PATH) # @export PATH=/usr/local/bin:$(PATH)
@ -14,7 +24,7 @@ prebuild:
clean: clean:
# @export PATH=/usr/local/bin:$(PATH) # @export PATH=/usr/local/bin:$(PATH)
${NANT} clean -${NANT} clean
test: prebuild test: prebuild
${NANT} test ${NANT} test