ubuntu packaging: fixed partial debian merge and updated for 1.17 maintenance changes

2012-05-15 08:28:55 +02:00
parent f0980f6d33
commit c7d977f2d4
6 changed files with 25 additions and 8 deletions
@@ -48,9 +48,13 @@ install:
 	dh_installdirs

 	$(MAKE) STRIP=ls prefix=$(CURDIR)/debian/tmp/usr install
+	# Note: the debian rules file uses --prefix instead of --root
+	# but this ends up generating an error on the ubuntu ppa:
+	#   "Found files in /usr/lib/python2.7/site-packages (must be in
+	#    dist-packages for python2.7)."
 	(cd python/recoll; python setup.py install \
 	                                   --install-layout=deb \
-	                                   --prefix=$(CURDIR)/debian/tmp/usr )
+	                                   --root=$(CURDIR)/debian/tmp )

 binary-arch: build install
 	dh_testdir