Revert to Q_OS_LINUX

scribusproject · Jan 20, 2019 · e51649a · e51649a
1 parent e12e51d
commit e51649a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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("/..");