From 73704a2a84b7e41e47c0f0cc9e06836561d7b34d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Wed, 14 May 2014 13:42:06 +0200 Subject: [PATCH] copy launch scripts during Linux make install --- Makefile | 4 +++- packaging/linux/buildpackage.sh | 3 --- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 4ba93c89ad..47cf4c1ce1 100644 --- a/Makefile +++ b/Makefile @@ -328,7 +328,9 @@ install-core: default @$(INSTALL_PROGRAM) thirdparty/Newtonsoft.Json.dll "$(DATA_INSTALL_DIR)" @$(INSTALL_PROGRAM) thirdparty/RestSharp.dll "$(DATA_INSTALL_DIR)" - @$(INSTALL_PROGRAM) -m +rx "error-dialog.sh" "$(DATA_INSTALL_DIR)" +ifeq ($(shell uname),Linux) + @$(CP) *.sh "$(DATA_INSTALL_DIR)" +endif @echo "#!/bin/sh" > openra @echo 'BINDIR=$$(dirname $$(readlink -f $$0))' >> openra diff --git a/packaging/linux/buildpackage.sh b/packaging/linux/buildpackage.sh index 7498cccf26..aab32387c0 100755 --- a/packaging/linux/buildpackage.sh +++ b/packaging/linux/buildpackage.sh @@ -24,9 +24,6 @@ make install-all prefix="/usr" DESTDIR="$PWD/packaging/linux/$ROOTDIR" # Native library dependencies cp "$DEPSDIR"/* "$PWD/packaging/linux/$ROOTDIR/usr/lib/openra/" || exit 3 -# Launch scripts (executed by Desura) -cp *.sh "$PWD/packaging/linux/$ROOTDIR/usr/lib/openra/" || exit 3 - # Icons and .desktop files make install-shortcuts prefix="/usr" DESTDIR="$PWD/packaging/linux/$ROOTDIR"