From 7c79b8948f5341d73898f5fbd37f5f34a901649c Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Wed, 28 Jun 2017 06:33:27 +0200 Subject: [PATCH] Fixes for mac zip. --- rssguard.pro | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/rssguard.pro b/rssguard.pro index 0e81cfeb0..b9601754b 100755 --- a/rssguard.pro +++ b/rssguard.pro @@ -592,14 +592,26 @@ win32 { QMAKE_EXTRA_TARGETS += seven_zip zip } -unix|mac { +unix|!mac { seven_zip.target = 7zip seven_zip.depends = install - seven_zip.commands = 7za a -t7z "$$TARGET-$$APP_VERSION-$$APP_REVISION-unix-mac.7z" $$shell_quote($$shell_path($$PREFIX/*)) + seven_zip.commands = 7za a -t7z "$$TARGET-$$APP_VERSION-$$APP_REVISION-linux.7z" $$shell_quote($$shell_path($$PREFIX/*)) zip.target = zip zip.depends = install - zip.commands = 7za a -tzip "$$TARGET-$$APP_VERSION-$$APP_REVISION-unix-mac.zip" $$shell_quote($$shell_path($$PREFIX/*)) + zip.commands = 7za a -tzip "$$TARGET-$$APP_VERSION-$$APP_REVISION-linux.zip" $$shell_quote($$shell_path($$PREFIX/*)) + + QMAKE_EXTRA_TARGETS += seven_zip zip +} + +mac { + seven_zip.target = 7zip + seven_zip.depends = install + seven_zip.commands = 7za a -t7z "$$TARGET-$$APP_VERSION-$$APP_REVISION-mac.7z" $$shell_quote($$shell_path($$PREFIX)) + + zip.target = zip + zip.depends = install + zip.commands = 7za a -tzip "$$TARGET-$$APP_VERSION-$$APP_REVISION-mac.zip" $$shell_quote($$shell_path($$PREFIX)) QMAKE_EXTRA_TARGETS += seven_zip zip }