qextserialport: use 'make install' to install to staging

qmake hardcodes the path to the sysroot in the install commands, so
we can't use it for target. But it's perfectly usable for staging.

By using 'make install', we get:
- the extserialport.prf file is installed to the mkspecs directory and
  libqextserialport.prl in staging/usr/lib, so qmake can do its magic
  and add the necessary compiler options;
- it also works for static build, when *.so files don't exist.

The QExtSerialPort and qextserialport.pc files are created by
Buildroot so they still have to be installed explicitly. Note that
upstream installs in the QtExtSerialPort directory, not QExtSerialPort,
so we follow that decision.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
[Thomas: also adjust 0003-pkgconfig.patch to fix the header path.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Arnout Vandecappelle 2016-11-20 23:13:28 +01:00 committed by Thomas Petazzoni
parent 18af7b5787
commit 8ad8e9917f
3 changed files with 4 additions and 6 deletions

View File

@ -1,7 +1,7 @@
Create a main include file QExtSerialPort
This main include file will be installed in
<QExtSerialPort/QExtSerialPort> so that Qt applications can use this
<QtExtSerialPort/QExtSerialPort> so that Qt applications can use this
library by including header files in a Qt-like style.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

View File

@ -10,7 +10,7 @@ Index: qextserialport-ef4af2a2ee3f/qextserialport.pc
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${prefix}/lib
+includedir=${prefix}/include/QExtSerialPort
+includedir=${prefix}/include/QtExtSerialPort
+
+Name: QtExtSerialPort
+Description: QtExtSerialPort library

View File

@ -27,10 +27,8 @@ define QEXTSERIALPORT_BUILD_CMDS
endef
define QEXTSERIALPORT_INSTALL_STAGING_CMDS
mkdir -p $(STAGING_DIR)/usr/include/QExtSerialPort
cp $(@D)/src/*.h $(STAGING_DIR)/usr/include/QExtSerialPort/
cp $(@D)/src/QExtSerialPort $(STAGING_DIR)/usr/include/QExtSerialPort/
cp -a $(@D)/*.so* $(STAGING_DIR)/usr/lib/
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
cp $(@D)/src/QExtSerialPort $(STAGING_DIR)/usr/include/QtExtSerialPort/
cp $(@D)/qextserialport.pc $(STAGING_DIR)/usr/lib/pkgconfig/
endef