aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDr Scofield2009-04-16 12:07:40 +0000
committerDr Scofield2009-04-16 12:07:40 +0000
commit96259e82f6317994a7a0e4a25d1f70961b9065c1 (patch)
treecb59397b7c64526911916e3f808c787ae9070a1d
parent* Remove some super experimental stuff in BulletDotNETPlugin since it was cau... (diff)
downloadopensim-SC_OLD-96259e82f6317994a7a0e4a25d1f70961b9065c1.zip
opensim-SC_OLD-96259e82f6317994a7a0e4a25d1f70961b9065c1.tar.gz
opensim-SC_OLD-96259e82f6317994a7a0e4a25d1f70961b9065c1.tar.bz2
opensim-SC_OLD-96259e82f6317994a7a0e4a25d1f70961b9065c1.tar.xz
move inclusion of Makefile.local to the end to avoid surprising results
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 1bc1005..8924d34 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,5 @@
1NANT = $(shell if test "$$EMACS" = "t" ; then echo "nant"; else echo "./nant-color"; fi) 1NANT = $(shell if test "$$EMACS" = "t" ; then echo "nant"; else echo "./nant-color"; fi)
2 2
3include $(wildcard Makefile.local)
4
5all: prebuild 3all: prebuild
6 # @export PATH=/usr/local/bin:$(PATH) 4 # @export PATH=/usr/local/bin:$(PATH)
7 ${NANT} 5 ${NANT}
@@ -27,3 +25,5 @@ test-xml: prebuild
27tags: 25tags:
28 find OpenSim -name \*\.cs | xargs etags 26 find OpenSim -name \*\.cs | xargs etags
29 27
28include $(wildcard Makefile.local)
29