summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Koenig <Joerg.Koenig@techsat.com>2019-05-17 11:57:00 (GMT)
committerJoerg Koenig <Joerg.Koenig@techsat.com>2019-05-17 11:57:00 (GMT)
commitfb286dc9bb09a5a847b99a49850e0df7bb4ed000 (patch)
tree79b4291e4c5a260052ae3e40f911fd84de4f6d56
parentb2e4a99797fc5089e9acf1379209303ce49d8141 (diff)
downloadQt-fb286dc9bb09a5a847b99a49850e0df7bb4ed000.zip
Qt-fb286dc9bb09a5a847b99a49850e0df7bb4ed000.tar.gz
Qt-fb286dc9bb09a5a847b99a49850e0df7bb4ed000.tar.bz2
Added qt.conf file
Change-Id: I9ec2cba549b20e33b8daea77d0b52067c08a19f3
-rw-r--r--Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 1c38b77..ffd7e6c 100644
--- a/Makefile
+++ b/Makefile
@@ -104,6 +104,7 @@ qt.x86-linux64.shared:
-confirm-license && \
make -j$(JOBS) && \
make -j$(JOBS) install
+ cp -f $(TOP)/qt.conf $(LOCAL_INST_PATH)/qt-$(VERSION)-shared/bin/
cd $(LOCAL_INST_PATH)/qt-$(VERSION)-shared && \
tar -zcf $(TOP)/qt-$(VERSION)-shared-$(ARCH).tgz ./
@@ -143,6 +144,7 @@ qt.x86-linux64.static:
-confirm-license && \
make -j$(JOBS) && \
make -j$(JOBS) install
+ cp -f $(TOP)/qt.conf $(LOCAL_INST_PATH)/qt-$(VERSION)-static/bin/
cd $(LOCAL_INST_PATH)/qt-$(VERSION)-static && \
tar -zcf $(TOP)/qt-$(VERSION)-static-$(ARCH).tgz ./
merge: