diff options
| author | Danomi Manchego <danomimanchego123@gmail.com> | 2016-03-01 21:54:40 -0500 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2016-04-13 23:56:44 +0200 |
| commit | 591cd5d37df17a7893e30746193a9c8eb2ca3676 (patch) | |
| tree | 9d5af478b7da1f62599bdc7049f9986270991230 | |
| parent | 1287e31d60ccfb72931cf8b7e83ae80bc72f0cf0 (diff) | |
| download | buildroot-591cd5d37df17a7893e30746193a9c8eb2ca3676.tar.gz buildroot-591cd5d37df17a7893e30746193a9c8eb2ca3676.zip | |
qt: get rid of extra spaces in license file list
Use "QT_LICENSE := $(QT_LICENSE), xxxx" construct to get rid of the
extra spaces before commas added by the font license clauses.
Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
| -rw-r--r-- | package/qt/qt.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/package/qt/qt.mk b/package/qt/qt.mk index c4fff2dc3a..f29a6714bc 100644 --- a/package/qt/qt.mk +++ b/package/qt/qt.mk @@ -18,9 +18,9 @@ QT_SITE = http://download.qt-project.org/official_releases/qt/$(QT_VERSION_MAJOR QT_DEPENDENCIES = host-pkgconf QT_INSTALL_STAGING = YES -QT_LICENSE = LGPLv2.1 with exceptions or GPLv3 +QT_LICENSE := LGPLv2.1 with exceptions or GPLv3 ifneq ($(BR2_PACKAGE_QT_LICENSE_APPROVED),y) -QT_LICENSE += or Digia Qt Commercial license +QT_LICENSE := $(QT_LICENSE) or Digia Qt Commercial license endif QT_LICENSE_FILES = LICENSE.LGPL LGPL_EXCEPTION.txt LICENSE.GPL3 @@ -663,14 +663,14 @@ endef ifneq ($(BR2_PACKAGE_QT_FONT_MICRO)$(BR2_PACKAGE_QT_FONT_FIXED),) # as stated in the font source src/3rdparty/fonts/micro.bdf # source src/3rdparty/fonts/5x7.bdf and source src/3rdparty/fonts/6x13.bdf -QT_LICENSE += , Public Domain (Micro/Fixed font) +QT_LICENSE := $(QT_LICENSE), Public Domain (Micro/Fixed font) endif ifneq ($(BR2_PACKAGE_QT_FONT_HELVETICA)$(BR2_PACKAGE_QT_FONT_JAPANESE),) -QT_LICENSE += , Adobe Helvetica license (Helvetica/Japanese fonts) +QT_LICENSE := $(QT_LICENSE), Adobe Helvetica license (Helvetica/Japanese fonts) QT_LICENSE_FILES += src/3rdparty/fonts/COPYING.Helvetica endif ifeq ($(BR2_PACKAGE_QT_FONT_UNIFONT),y) -QT_LICENSE += , Freeware (Unifont font) +QT_LICENSE := $(QT_LICENSE), Freeware (Unifont font) QT_LICENSE_FILES += src/3rdparty/fonts/COPYRIGHT.Unifont endif endif # QT_FONTS @@ -680,7 +680,7 @@ define QT_INSTALL_TARGET_FONTS_TTF mkdir -p $(TARGET_DIR)/usr/lib/fonts cp -dpf $(STAGING_DIR)/usr/lib/fonts/*.ttf $(TARGET_DIR)/usr/lib/fonts endef -QT_LICENSE += , Bitstream license (DejaVu/Vera TrueType fonts) +QT_LICENSE := $(QT_LICENSE), Bitstream license (DejaVu/Vera TrueType fonts) QT_LICENSE_FILES += src/3rdparty/fonts/COPYRIGHT.DejaVu \ src/3rdparty/fonts/README.DejaVu \ src/3rdparty/fonts/COPYRIGHT.Vera |
