Merge lp:~spud/spud/fix-non-debian-build-201403 into lp:spud

[Tim Greaves]

On CentOS when building with DESTDIR set, 'make install-dxdiff' fails when pyversions isn't found - this is a Debian-specific python tool. It appears that a BUILDING_DEBIAN has been mistakenly replaced with a DESTDIR in Makefile.in to cause this behaviour.

On CentOS when building with DESTDIR set, 'make install-dxdiff' fails when pyversions isn't found - this is a Debian-specific python tool. It appears that a BUILDING_DEBIAN has been mistakenly replaced with a DESTDIR in Makefile.in to cause this behaviour. This merge fixes the problem.

Please could someone sanity-check this to make sure that there isn't something deeper going on such that this isn't a 'mistake'.

[Cian Wilson (cwilson)]

Based on the lines above for 'install-pyspud' this looks sane to me but I can't comment for sure.

I'm piping up more because I haven't hit this on centos (6.2 and 6.5) so am curious what's different. Under what circumstances is DESTDIR defined?

Your fix works fine for me on centos too so no problems from that perspective.

[Tim Greaves (tim-greaves)]

This was whilst package building on CentOS, where I had prefix set for the 'real' build destination but DESTDIR also set so the install actually went into the package buildroot. Most of the time (i.e., standard build from source) on CentOS it's fine!

[Tim Greaves (tim-greaves)]

The package in question, if anyone fancies tinkering with it, is at http://amcg.ese.ic.ac.uk/yum/rhel/6/

It's broadly mirroring the packaging in debian/ and is only very lightly tested - build and install dependencies in particular may well need some tweaking.

[Cian Wilson (cwilson)]

OK, that explains that then. Thanks.

As far as I can tell, this looks good to me. Up to you if you want to wait for another opinion :)

review: Approve

[Tim Greaves (tim-greaves)]

Thanks Cian!

=== modified file 'Makefile.in'
--- Makefile.in	2012-10-17 14:53:21 +0000
+++ Makefile.in	2014-03-07 18:56:20 +0000
@@ -103,7 +103,7 @@
 endif
 
 install-dxdiff:
-ifeq ($(origin DESTDIR),undefined)
+ifeq ($(origin BUILDING_DEBIAN),undefined)
 	cd dxdiff; python setup.py install --prefix=$(DESTDIR)@prefix@; cd ..
 else
 	cd dxdiff; for python in $(shell pyversions -r); do $$python setup.py install --prefix=$(DESTDIR)@prefix@ --install-layout=deb; done; cd ..