From a233d373171f2cda549877137441d2dd8d75ca95 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Wed, 29 Apr 2015 15:10:26 +0300 Subject: [PATCH] Fix for building on Mac OS X. --HG-- branch : release --- src/app/app.pro | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/app/app.pro b/src/app/app.pro index 4a07eba24..3538b335d 100644 --- a/src/app/app.pro +++ b/src/app/app.pro @@ -242,9 +242,10 @@ unix{ # Path to resources in app bundle RESOURCES_DIR = "Contents/Resources" FRAMEWORKS_DIR = "Contents/Frameworks" + MACOS_DIR = "Contents/MacOS" # On macx we will use app bundle. Bundle doesn't need bin directory inside. # See issue #166: Creating OSX Homebrew (Mac OS X package manager) formula. - target.path = $$PREFIX/ + target.path = $$MACOS_DIR # Copy in bundle translation files. exists($${TRANSLATIONS_PATH}/valentina_ru_RU.qm){ @@ -342,8 +343,8 @@ unix{ libraries.files += $${OUT_PWD}/../libs/vpropertyexplorer/$${DESTDIR}/libvpropertyexplorer.1.dylib # Utility pdftops need for saving a layout image to PS and EPS formates. - xpdf.path = $$PREFIX/ - xpdf.files += $${PWD}../../dist/macx/bin64/pdftops + xpdf.path = $$MACOS_DIR + xpdf.files += $${PWD}/../../dist/macx/bin64/pdftops # logo on macx. ICON = ../../dist/Valentina.icns