From e51649adf1c0d72e912b87b0cc44ececd580281d Mon Sep 17 00:00:00 2001 From: Galileo Sartor Date: Sun, 20 Jan 2019 20:55:48 +0100 Subject: [PATCH] Revert to Q_OS_LINUX --- .travis.yml | 2 +- scribus/scpaths.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 462a6a38c1..5798f15f84 100644 --- a/.travis.yml +++ b/.travis.yml @@ -77,7 +77,7 @@ script: else export NPROC=1; fi; - cmake . -DCMAKE_INSTALL_PREFIX=/usr -DWANT_HUNSPELL=1 -DWITH_PODOFO=1 -DWANT_GRAPHICSMAGICK=1 -DWANT_DEBUG=0 -DWANT_SVNVERSION=0 -DWANT_GUI_LANG=en_US -DBUILD_APPIMAGE_BUNDLE=1; + cmake . -DCMAKE_INSTALL_PREFIX=/usr -DWANT_HUNSPELL=1 -DWITH_PODOFO=1 -DWANT_GRAPHICSMAGICK=1 -DWANT_DEBUG=0 -DWANT_SVNVERSION=0 -DWANT_GUI_LANG=en_US; make -j"$NPROC"; make DESTDIR=appdir -j"$NPROC" install ; find appdir/; cp /usr/lib/python2.7/lib-dynload/_tkinter.so appdir/usr/; diff --git a/scribus/scpaths.cpp b/scribus/scpaths.cpp index dc62f1475b..168ef4090a 100644 --- a/scribus/scpaths.cpp +++ b/scribus/scpaths.cpp @@ -70,7 +70,7 @@ ScPaths::ScPaths() : // Build an appimage and redirect the paths to // ones inside the bundle, relative to the executable. -#ifdef BUILD_APPIMAGE_BUNDLE +#ifdef Q_OS_LINUX // Set the application name expliticly. QCoreApplication::setApplicationName("scribus"); QString pathPtr = QCoreApplication::applicationDirPath() + QString("/..");