From 8ba34cb6520d04171ade1315b5aa375a94a5f935 Mon Sep 17 00:00:00 2001 From: hallgren Date: Thu, 19 Jun 2014 15:45:55 +0000 Subject: [PATCH] debian/rules: a hack to put the python binding in the right directory The setup.py script puts it under site-packages, but python only looks under dist-packages... Also some minor changes for 'make deb' in Makefile --- Makefile | 4 ++-- debian/rules | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 1a819ae68..ad5c23e01 100644 --- a/Makefile +++ b/Makefile @@ -30,6 +30,6 @@ html:: # Make a debian package. First add a suitable entry with the correct GF version # number to the top of debian/changelog. -# (Tested on Ubuntu 11.10 & 12.04. You need to install dpkg-dev & debhelper.) +# (Tested on Ubuntu 14.04. You need to install dpkg-dev & debhelper.) deb: - dpkg-buildpackage -us -uc + dpkg-buildpackage -b diff --git a/debian/rules b/debian/rules index f4e55bb20..8405cf2bd 100644 --- a/debian/rules +++ b/debian/rules @@ -24,6 +24,7 @@ override_dh_auto_install: LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(CURDIR)/src/runtime/c/.libs cabal copy --destdir=$(CURDIR)/debian/gf cd src/runtime/c && ./setup.sh copy prefix=$(CURDIR)/debian/gf/usr cd src/runtime/python && python setup.py install --prefix=$(CURDIR)/debian/gf/usr + D="`find debian/gf -name site-packages`" && [ -n "$$D" ] && cd $$D && cd .. && mv site-packages dist-packages override_dh_auto_test: ifneq (nocheck,$(filter nocheck,$(DEB_BUILD_OPTIONS)))