add proper support for "make install" and use it for the linux builds

scripts/build.py

@@ -844,10 +844,8 @@ def build_linux_schroot(config, basedir):
     script = os.path.join(dir, 'build.sh')
     dist   = os.path.join(dir, 'wkhtmltox-%s' % version)
 
+    mkdir_p(dir)
     rmdir(dist)
-    mkdir_p(os.path.join(dist, 'bin'))
-    mkdir_p(os.path.join(dist, 'include', 'wkhtmltox'))
-    mkdir_p(os.path.join(dist, 'lib'))
 
     configure_args = qt_config('posix', '--prefix=%s' % os.path.join(dir, 'qt'))
 
@@ -870,12 +868,7 @@ def build_linux_schroot(config, basedir):
     lines.append('rm -f bin/*')
     lines.append('export WKHTMLTOX_VERSION=%s' % version)
     lines.append('../qt/bin/qmake ../../../wkhtmltopdf.pro')
-    lines.append('make -j%d || exit 1' % CPU_COUNT)
-    lines.append('strip bin/wkhtmltopdf bin/wkhtmltoimage')
-    lines.append('cp bin/wkhtmlto* ../wkhtmltox-%s/bin' % version)
-    lines.append('cp -P bin/libwkhtmltox*.so.* ../wkhtmltox-%s/lib' % version)
-    lines.append('cp ../../../include/wkhtmltox/*.h ../wkhtmltox-%s/include/wkhtmltox' % version)
-    lines.append('cp ../../../include/wkhtmltox/dll*.inc ../wkhtmltox-%s/include/wkhtmltox' % version)
+    lines.append('make install INSTALL_ROOT=%s || exit 1' % dist)
     lines.append('cd ..')
     lines.append('tar -c -v -f ../wkhtmltox-%s_linux-%s.tar wkhtmltox-%s/' % (version, config, version))
     lines.append('xz --compress --force --verbose -9 ../wkhtmltox-%s_linux-%s.tar' % (version, config))

src/image/image.pro

@@ -24,17 +24,11 @@ DEPENDPATH += . ../shared
 INCLUDEPATH += . ../shared
 
 unix {
-    man.target=../../wkhtmltoimage.1.gz
-    man.commands=LD_LIBRARY_PATH=../../bin/ ../../bin/wkhtmltoimage --manpage | gzip > $@
-    man.depends=../../bin/wkhtmltoimage
+    man.path=$$INSTALLBASE/share/man/man1
+    man.extra=LD_LIBRARY_PATH=../../bin/ ../../bin/wkhtmltoimage --manpage | gzip > $(INSTALL_ROOT)/share/man/man1/wkhtmltoimage.1.gz
 
-    manins.target=manins
-    manins.depends=man
-    manins.files=../../wkhtmltoimage.1.gz
-    manins.path=$$INSTALLBASE/share/man/man1
-
-    QMAKE_EXTRA_TARGETS += manins man
-    INSTALLS += manins
+    QMAKE_EXTRA_TARGETS += man
+    INSTALLS += man
 }
 
 macx {

src/lib/lib.pro

@@ -26,7 +26,7 @@ contains(QMAKE_PRL_CONFIG, static): DEFINES += QT_NODLL
 
 unix {
    headers.target=headers
-   headers.files=../../include/wkhtmltox/*
+   headers.files=../../include/wkhtmltox/*.h ../../include/wkhtmltox/*.inc
    headers.path=$$INSTALLBASE/include/wkhtmltox
 
    QMAKE_EXTRA_TARGETS += headers

src/pdf/pdf.pro

@@ -24,17 +24,11 @@ DEPENDPATH += . ../shared
 INCLUDEPATH += . ../shared
 
 unix {
-    man.target=../../wkhtmltopdf.1.gz
-    man.commands=LD_LIBRARY_PATH=../../bin/ ../../bin/wkhtmltopdf --manpage | gzip > $@
-    man.depends=../../bin/wkhtmltopdf
+    man.path=$$INSTALLBASE/share/man/man1
+    man.extra=LD_LIBRARY_PATH=../../bin/ ../../bin/wkhtmltopdf --manpage | gzip > $(INSTALL_ROOT)/share/man/man1/wkhtmltopdf.1.gz
 
-    manins.target=manins
-    manins.depends=man
-    manins.files=../../wkhtmltopdf.1.gz
-    manins.path=$$INSTALLBASE/share/man/man1
-
-    QMAKE_EXTRA_TARGETS += manins man
-    INSTALLS += manins
+    QMAKE_EXTRA_TARGETS += man
+    INSTALLS += man
 }
 
 macx {