From: Andreas Naumann Date: Mon, 17 Feb 2020 21:23:37 +0000 (+0100) Subject: package/qt-webkit-kiosk: convert to qmake infrastructure X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8440ef6ad20f591f52f261b24537c0a4862e7609;p=buildroot.git package/qt-webkit-kiosk: convert to qmake infrastructure Convert but keep the slightly complicated custom install step for now. Signed-off-by: Andreas Naumann Signed-off-by: Thomas Petazzoni --- diff --git a/package/qt-webkit-kiosk/qt-webkit-kiosk.mk b/package/qt-webkit-kiosk/qt-webkit-kiosk.mk index a714fca9c9..cd1c21e28a 100644 --- a/package/qt-webkit-kiosk/qt-webkit-kiosk.mk +++ b/package/qt-webkit-kiosk/qt-webkit-kiosk.mk @@ -11,13 +11,7 @@ QT_WEBKIT_KIOSK_DEPENDENCIES = qt5webkit qt5multimedia QT_WEBKIT_KIOSK_LICENSE = LGPL-3.0 QT_WEBKIT_KIOSK_LICENSE_FILES = doc/lgpl.html -define QT_WEBKIT_KIOSK_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(QT5_QMAKE) PREFIX=/usr) -endef - -define QT_WEBKIT_KIOSK_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef +QT_WEBKIT_KIOSK_CONF_OPTS = PREFIX=/usr define QT_WEBKIT_KIOSK_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/src -f Makefile.qt-webkit-kiosk \ @@ -29,4 +23,4 @@ define QT_WEBKIT_KIOSK_INSTALL_TARGET_CMDS $(if $(BR2_PACKAGE_QT_WEBKIT_KIOSK_SOUNDS),install_sound) endef -$(eval $(generic-package)) +$(eval $(qmake-package))