Redirect uname command to /dev/null and update build instructions

dh4 · Sep 11, 2015 · a37fcd8 · a37fcd8
1 parent 0bb6328
commit a37fcd8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -8,34 +8,37 @@ A discussion thread as well as links to binary downloads can be found [here](htt
 
 ### Linux
 
-You'll need to make sure you have qmake, g++, the Qt development libraries and the Quazip development files installed. On Debian/Ubuntu, this can be accomplished by:
+You'll need to make sure you have qmake, g++, the Qt development libraries and the QuaZIP development files installed. On Debian/Ubuntu, this can be accomplished by:
 
 ```
-# apt-get install qt4-qmake g++ libqt4-dev libquazip-dev libqt4-sql-sqlite
+# apt-get install qt5-qmake g++ qtbase5-dev libquazip-qt5-dev libqt5sql5-sqlite
 ```
 
 Once the needed packages are installed, create the Makefile with qmake and then build with make:
 
 ```
-$ qmake-qt4
+$ qmake
 $ make
 ```
 
-#### Building with Qt5
+If qmake returns "qmake: could not find a Qt installation of ''", you can try running `QT_SELECT=qt5 qmake` or `/usr/lib/x86_64-linux-gnu/qt5/bin/qmake`. Some distributions also contain a `qmake-qt5` symlink.
+
+#### Building with Qt4
 
-Install the Qt5 dependencies instead:
+Install the Qt4 dependencies instead. On Debian/Ubuntu:
 
 ```
-# apt-get install qt5-qmake g++ qtbase5-dev libquazip-qt5-dev libqt5sql5-sqlite
+# apt-get install qt4-qmake g++ libqt4-dev libquazip-dev libqt4-sql-sqlite
 ```
 
-On a Debian-based distribution with libquazip-qt5-dev installed, you'll need to change -lquazip to -lquazip-qt5 near the end of mupen64plus-qt.pro.
+Then create the Makefile with qmake and build with make:
 
 ```
-$ qmake-qt5
+$ qmake-qt4
 $ make
 ```
 
+
 ## Usage
 
 Mupen64Plus-Qt utilizes the console UI to launch games. It contains support for most of the command line parameters. These can be viewed by running Mupen64Plus from a terminal with the --help parameter or [here](https://code.google.com/p/mupen64plus/wiki/UIConsoleUsage).

diff --git a/mupen64plus-qt.pro b/mupen64plus-qt.pro
@@ -62,7 +62,7 @@ win32|macx {
         LIBS += -lquazip
     } else {
         # Debian distributions use a different library name for Qt5 quazip
-        system("uname -a | grep -E 'Debian|Ubuntu'") {
+        system("uname -a | grep -E 'Debian|Ubuntu' > /dev/null") {
             LIBS += -lquazip-qt5
         } else {
             LIBS += -lquazip5