epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

install openra to /usr/lib now that we ship native libraries

Browse Source
This commit is contained in:
Matthias Mailänder
2013-11-16 11:56:35 +01:00
committed by ScottNZ
parent 1d60b86b9b
commit 2062a1bf9b
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -48,8 +48,10 @@ prefix ?= /usr/local
datarootdir ?= $(prefix)/share datarootdir ?= $(prefix)/share
datadir ?= $(datarootdir) datadir ?= $(datarootdir)
bindir ?= $(prefix)/bin bindir ?= $(prefix)/bin
libexecdir ?= $(prefix)/lib
BIN_INSTALL_DIR = $(DESTDIR)$(bindir) BIN_INSTALL_DIR = $(DESTDIR)$(bindir)
DATA_INSTALL_DIR = $(DESTDIR)$(datadir)/openra # TODO: separate data and binaries properly
DATA_INSTALL_DIR = $(DESTDIR)$(libexecdir)/openra
# install tools # install tools
RM = rm RM = rm

2
packaging/linux/buildpackage.sh
View File

@@ -20,7 +20,7 @@ cd ../..
make install-all prefix="/usr" DESTDIR="$PWD/packaging/linux/$ROOTDIR" make install-all prefix="/usr" DESTDIR="$PWD/packaging/linux/$ROOTDIR"
# Launch scripts (executed by Desura) # Launch scripts (executed by Desura)
cp *.sh "$PWD/packaging/linux/$ROOTDIR/usr/share/openra/" || exit 3 cp *.sh "$PWD/packaging/linux/$ROOTDIR/usr/lib/openra/" || exit 3
# Icons and .desktop files # Icons and .desktop files
make install-shortcuts prefix="/usr" DESTDIR="$PWD/packaging/linux/$ROOTDIR" make install-shortcuts prefix="/usr" DESTDIR="$PWD/packaging/linux/$ROOTDIR"

2
packaging/linux/rpm/buildpackage.sh
View File

@@ -13,7 +13,7 @@ sed -i "s/{VERSION_FIELD}/$PKGVERSION/" openra.spec
rootdir=`readlink -f $2` rootdir=`readlink -f $2`
sed -i "s|{ROOT_DIR}|$rootdir|" openra.spec sed -i "s|{ROOT_DIR}|$rootdir|" openra.spec
for x in `find $rootdir/usr/share/openra -type d` for x in `find $rootdir/usr/lib/openra -type d`
do do
y="${x#$rootdir}" y="${x#$rootdir}"
sed -i "/%files/ a ${y}" openra.spec sed -i "/%files/ a ${y}" openra.spec