From 0a5d78bbf146fad1a58d948e7b1477264a99dcfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Wed, 14 May 2014 13:44:40 +0200 Subject: [PATCH] fix missing hard-coded native deps after make install --- Makefile | 1 + packaging/linux/buildpackage.sh | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 47cf4c1ce1..24d603aee9 100644 --- a/Makefile +++ b/Makefile @@ -327,6 +327,7 @@ install-core: default @$(INSTALL_PROGRAM) thirdparty/MaxMind.GeoIP2.dll "$(DATA_INSTALL_DIR)" @$(INSTALL_PROGRAM) thirdparty/Newtonsoft.Json.dll "$(DATA_INSTALL_DIR)" @$(INSTALL_PROGRAM) thirdparty/RestSharp.dll "$(DATA_INSTALL_DIR)" + @$(CP) thirdparty/${platformdeps}/* "$(DATA_INSTALL_DIR)" ifeq ($(shell uname),Linux) @$(CP) *.sh "$(DATA_INSTALL_DIR)" diff --git a/packaging/linux/buildpackage.sh b/packaging/linux/buildpackage.sh index aab32387c0..18dbca4a09 100755 --- a/packaging/linux/buildpackage.sh +++ b/packaging/linux/buildpackage.sh @@ -21,9 +21,6 @@ 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" -# Native library dependencies -cp "$DEPSDIR"/* "$PWD/packaging/linux/$ROOTDIR/usr/lib/openra/" || exit 3 - # Icons and .desktop files make install-shortcuts prefix="/usr" DESTDIR="$PWD/packaging/linux/$ROOTDIR"