Merge lp:~fluidity-core/fluidity/dont-install-diamond into lp:fluidity

[Patrick Farrell]

Fluidity bundles libspud, as it needs it to build. libspud comes with Diamond, which also happened to be installed from the libspud/ directory to fluidity's bin/ directory as part of the building of libspud, but that was an unintended side-effect. linzhenhua reported a bug on the fluidity mailing list, that the version of Diamond installed in this process is broken, which is true; this was never detected because we always install Diamond separately.

This change makes it so that fluidity only installs the libspud and python binding components that are bundled in the libspud/ directory; i.e., diamond is no longer installed from libspud/ to fluidity's bin/. This should prevent any users getting confused about this in the future.

Aside: I wish bzr had actual externals support; the feature seems so easy, and yet it isn't available!

[Tim Bond (timothy-bond)]

The fix looks good to me and the libspud/libspud.a rule works for me on a quick build test. I'm thinking it may be worth doing a bit of tidying of the libspud/ directory at some point too to remove un-needed code, and also small tidies like making the target in the makefile libspud.so as opposed to libspud.a, though this is unimportant to this merge.

Good to go; approve.

review: Approve

=== modified file 'Makefile.in'
--- Makefile.in	2011-11-18 16:07:09 +0000
+++ Makefile.in	2011-11-21 22:50:31 +0000
@@ -153,7 +153,7 @@
 ifeq (@SPUD_ONLY@,yes)
 	@cd libspud;  echo '    MAKE libspud'; $(MAKE) ; $(MAKE) install-libspud
 else
-	@cd libspud;  echo '    MAKE libspud'; $(MAKE) ; $(MAKE) install; cd ..; cp lib*/python*/site-packages/libspud.so python/
+	@cd libspud;  echo '    MAKE libspud'; $(MAKE) ; $(MAKE) install-libspud; cd python; python setup.py build; cd ../..; cp libspud/python/build/lib*/libspud.so python/
 endif
 
 libfemtools: sub_system
@@ -463,7 +463,7 @@
 	@cd tests/data; $(MAKE) clean
 
 distclean: clean
-	@echo "   DISTCLEAN"
+	@echo "    DISTCLEAN"
 	@cd spatialindex-1.5 ; make distclean > /dev/null ; rm -rf	\
 	 make.log regressiontest/mvrtree/.deps				\
 	 regressiontest/rtree/.deps regressiontest/tprtree/.deps >	\