Merge pull request #3837 from Mailaender/makefile-fixes

Use the Makefile install rules for our packaging

packaging/linux/buildpackage.sh

@@ -15,22 +15,17 @@ ROOTDIR=root
 # Clean up
 rm -rf $ROOTDIR
 
-# Game files
-mkdir -p $ROOTDIR/usr/bin/
-cp -T openra-bin $ROOTDIR/usr/bin/openra
-cp -T openra-editor-bin $ROOTDIR/usr/bin/openra-editor
-mkdir -p $ROOTDIR/usr/share/openra/
-cp -R $BUILTDIR/* "$ROOTDIR/usr/share/openra/" || exit 3
+cd ../..
+# Copy files for OpenRA.Game.exe and OpenRA.Editor.exe as well as all dependencies.
+make install-all prefix="/usr" DESTDIR="$PWD/packaging/linux/$ROOTDIR"
 
 # Launch scripts (executed by Desura)
-cp ../../*.sh "$ROOTDIR/usr/share/openra/" || exit 3
+cp *.sh "$PWD/packaging/linux/$ROOTDIR/usr/share/openra/" || exit 3
 
-# Desktop Icons
-mkdir -p $ROOTDIR/usr/share/applications/
-cp *.desktop "$ROOTDIR/usr/share/applications/"
+# Icons and .desktop files
+make install-shortcuts
 
-mkdir -p $ROOTDIR/usr/share/icons/
-cp -r hicolor $ROOTDIR/usr/share/icons/
+cd packaging/linux
 
 (
     echo "Building Debian package."

packaging/linux/openra-bin

@@ -1,3 +0,0 @@
-#!/bin/sh
-cd /usr/share/openra
-mono OpenRA.Game.exe "$@"

packaging/linux/openra-editor-bin

@@ -1,3 +0,0 @@
-#!/bin/sh
-cd /usr/share/openra
-mono OpenRA.Editor.exe "$@"