From 99b3e821339aeac59c45ddb3c482f4ec3e09ecf6 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sun, 20 Nov 2016 23:13:26 +0100 Subject: [PATCH] qextserialport: define QEXTSERIALPORT_CONFIGURE_CMDS only once Distinguish qt/qt5 by defining QEXTSERIALPORT_QMAKE, like is done e.g. for quazip. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/qextserialport/qextserialport.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package/qextserialport/qextserialport.mk b/package/qextserialport/qextserialport.mk index 39e04075b7..11b1cc89c7 100644 --- a/package/qextserialport/qextserialport.mk +++ b/package/qextserialport/qextserialport.mk @@ -12,15 +12,15 @@ QEXTSERIALPORT_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT),y) QEXTSERIALPORT_DEPENDENCIES += qt -define QEXTSERIALPORT_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(QT_QMAKE)) -endef +QEXTSERIALPORT_QMAKE = $(QT_QMAKE) else ifeq ($(BR2_PACKAGE_QT5),y) QEXTSERIALPORT_DEPENDENCIES += qt5base +QEXTSERIALPORT_QMAKE = $(QT5_QMAKE) +endif + define QEXTSERIALPORT_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(QT5_QMAKE)) + (cd $(@D); $(TARGET_MAKE_ENV) $(QEXTSERIALPORT_QMAKE)) endef -endif define QEXTSERIALPORT_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -- 2.30.2