Adapt make install and deb packaging for installing recollchm

packaging/debian/debian/changelog

@@ -1,3 +1,9 @@
+recoll (1.25.0pre0-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
+                
+  * Not a release: 1.25 development and testing
+    
+ -- Jean-Francois Dockes <jf@dockes.org>  Wed, 13 Jun 2018 08:38:00 +0200
+
 recoll (1.24.1-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
                 
   * New release 1.24.1.

packaging/debian/debian/python-recoll.install

@@ -1,2 +1,2 @@
-usr/lib/python2*/*-packages/*.egg-info
+usr/lib/python2*/*-packages/Recoll*.egg-info
 usr/lib/python2*/*-packages/recoll/*

packaging/debian/debian/python3-recoll.install

@@ -1,2 +1,2 @@
-usr/lib/python3*/*-packages/*.egg-info
+usr/lib/python3*/*-packages/Recoll*.egg-info
 usr/lib/python3*/*-packages/recoll/*

packaging/debian/debian/recollcmd.install

@@ -2,6 +2,8 @@ usr/bin/recollindex
 usr/bin/recollq
 usr/bin/xadump
 usr/lib/*/recoll
+usr/lib/python*/*-packages/recollchm/*
+usr/lib/python*/*-packages/recollchm-*/*
 usr/share/man
 usr/share/recoll/doc
 usr/share/recoll/examples

packaging/debian/debian/rules

@@ -27,13 +27,28 @@ build3vers := $(shell py3versions -sv)
 
 override_dh_auto_install:
 	dh_auto_install
-	(cd python/recoll; python setup.py install \
+	(cd python/recoll; libdir=/usr/lib/$${DEB_BUILD_MULTIARCH} python \
+					   ./setup.py install \
 	                                   --install-layout=deb \
-	                                   --prefix=$(CURDIR)/debian/tmp/usr )
+					   --prefix=/usr \
+	                                   --root=$(CURDIR)/debian/tmp/usr )
 	set -e && for i in $(build3vers); do \
 	(cd python/recoll; libdir=/usr/lib/$${DEB_BUILD_MULTIARCH} python$$i \
 					./setup.py install \
 	                                --install-layout=deb \
-	                                --prefix=$(CURDIR)/debian/tmp/usr ) ; \
+					--prefix=/usr \
+	                                --root=$(CURDIR)/debian/tmp/ ) ; \
+	done
+	(cd python/pychm; python ./setup.py install \
+	                                   --install-layout=deb \
+					   --prefix=/usr \
+	                                   --root=$(CURDIR)/debian/tmp/ )
+	set -e && for i in $(build3vers); do \
+	(cd python/pychm; python$$i ./setup.py install \
+	                                --install-layout=deb \
+					--prefix=/usr \
+	                                --root=$(CURDIR)/debian/tmp/ ) ; \
 	done
 	find $(CURDIR) -type f -name '*.la' -exec rm -f '{}' \;
+	find $(CURDIR) -type f -name '*.pyc' -exec rm -f '{}' \;
+	rm -rf $(CURDIR)/debian/tmp/usr/lib/python*/*/*/__pycache__

src/Makefile.am

@@ -506,7 +506,25 @@ qtgui/xmltosd.cpp \
 qtgui/xmltosd.h \
 \
 python/README.txt \
-python/recoll/Makefile.in \
+python/pychm/AUTHORS \
+python/pychm/COPYING \
+python/pychm/MANIFEST.in \
+python/pychm/README-RECOLL.txt \
+python/pychm/pychm.egg-info \
+python/pychm/pychm.egg-info/PKG-INFO \
+python/pychm/pychm.egg-info/SOURCES.txt \
+python/pychm/pychm.egg-info/dependency_links.txt \
+python/pychm/pychm.egg-info/top_level.txt \
+python/pychm/recollchm \
+python/pychm/recollchm/__init__.py \
+python/pychm/recollchm/__pycache__ \
+python/pychm/recollchm/chm.py \
+python/pychm/recollchm/chmlib.py \
+python/pychm/recollchm/extra.c \
+python/pychm/recollchm/swig_chm.c \
+python/pychm/recollchm/swig_chm.i \
+python/pychm/setup.py.in \
+python/recoll/Makefile \
 python/recoll/pyrclextract.cpp \
 python/recoll/pyrecoll.cpp \
 python/recoll/pyrecoll.h \