Merge pull request #49 from fszymanski/master

Update qmake project file and README.md

CasterSoundboard/CasterSoundboard.pro

@@ -4,15 +4,19 @@
 #
 #-------------------------------------------------
 
+isEmpty(PREFIX) {
+    PREFIX = /usr/local
+}
+BINDIR = $$PREFIX/bin
+DATADIR = $$PREFIX/share
 
-QT       += core gui multimedia network
+QT += core gui multimedia network
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
 TARGET = CasterSoundboard
 TEMPLATE = app
 
-
 SOURCES += main.cpp\
     CasterPlayer.cpp \
     CasterBoard.cpp \
@@ -124,25 +128,20 @@ HEADERS  += \
     libs/tools/NtpTimestamp.h \
     CasterOSCServerConfigPicker.h
 
+RESOURCES += res.qrc
 
-FORMS    +=
+linux {
+    appdata.files = ../dist/linux/CasterSoundboard.appdata.xml
+    appdata.path = $$DATADIR/appdata/
 
-RESOURCES += \
-    res.qrc
+    desktop.files = ../dist/linux/CasterSoundboard.desktop
+    desktop.path = $$DATADIR/applications/
 
-unix {
-    desktop.files = ../xdg/CasterSoundboard.desktop
-    desktop.path = $${PREFIX}/share/applications/
-    INSTALLS += desktop
+    pixmap.files = ../dist/linux/CasterSoundboard.png
+    pixmap.path = $$DATADIR/pixmaps/
 
-    appdata.files = ../xdg/CasterSoundboard.appdata.xml
-    appdata.path = $${PREFIX}/share/appdata/
-    INSTALLS += appdata
-
-    pixmap.files = ../xdg/CasterSoundboard.png
-    pixmap.path = $${PREFIX}/share/pixmaps/
-    INSTALLS += pixmap
+    INSTALLS += appdata desktop pixmap
 }
 
-target.path = $${PREFIX}/bin
+target.path = $$BINDIR
 INSTALLS += target

README.md

@@ -26,7 +26,7 @@ Building from Source for installation instructions.
 
 ## Packages
 ### Arch AUR
-Thanks to [@j605](https://github.com/j605 "Jagannathan Tiruvallur Eachambadi") for creating a PKGBUILD for people on Arch who want to try this software:
+Thanks to [@j605](https://github.com/j605 "Jagannathan Tiruvallur Eachambadi") for creating a `PKGBUILD` for people on Arch who want to try this software:
 + [CasterSoundboard-git](https://aur.archlinux.org/packages/castersoundboard-git)
 
 ### Fedora 25 and newer
@@ -38,7 +38,7 @@ RPM package can be found in the [Copr](https://copr.fedorainfracloud.org/coprs/f
 
 ### Building From Source
 
-First clone the repository using git, if you don't have git installed
+First clone the repository using `git`, if you don't have `git` installed
 you can find installation instructions [here](https://git-scm.com)
 
 ```
@@ -63,35 +63,36 @@ commands for various platforms are listed below:
 # brew install qt
 ```
 
-You should then have access to qmake, make, and the qt5 development
-libraries. Next cd into the project folder inside the repo:
+You should then have access to `qmake`, `make`, and the qt5 development
+libraries. Next `cd` into the project folder inside the repo:
 
 ```
 $ cd CasterSoundboard/CasterSoundboard
 ```
 
-Now run qmake, this will auto generate a makefile:
+You can specify the target directory using the `PREFIX` `qmake` variable (default: `/usr/local`).
+Now run `qmake`, this will auto generate a makefile:
 
 ```
-$ qmake
+$ qmake PREFIX=/usr
 ```
 
 or on Fedora:
 
 ```
-$ qmake-qt5
+$ qmake-qt5 PREFIX=/usr
 ```
 
-Then run make to build the project:
+Then run `make` to build the project:
 
 ```
 $ make
 ```
 
-And finally run make install to install the app:
+And finally run `make install` to install the app:
 
 ```
-# make install INSTALL_ROOT=/usr
+# make install
 ```
 
 Now you're good to go!