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

separate Linux only shortcuts and icons from make install

Browse Source
This commit is contained in:
Matthias Mailänder
2013-09-20 18:37:15 +02:00
parent 7a4f29afc6
commit 29d93f7d9d
2 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Makefile
View File

@@ -18,6 +18,9 @@
# to install with development tools, run: # to install with development tools, run:
# make [prefix=/foo] [bindir=/bar/bin] install-all # make [prefix=/foo] [bindir=/bar/bin] install-all
# #
# to install Linux desktop files and icons:
# make install-shortcuts
#
# to uninstall, run: # to uninstall, run:
# make uninstall # make uninstall
# #
@@ -334,12 +337,6 @@ install-core: default
@$(INSTALL_PROGRAM) -m +rx openra "$(BIN_INSTALL_DIR)" @$(INSTALL_PROGRAM) -m +rx openra "$(BIN_INSTALL_DIR)"
@-$(RM) openra @-$(RM) openra
@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/applications"
@$(INSTALL_DATA) packaging/linux/openra.desktop "$(DESTDIR)$(datadir)/applications"
@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/icons/"
@$(CP_R) packaging/linux/hicolor/ "$(DESTDIR)$(datadir)/icons"
install-tools: tools install-tools: tools
@-echo "Installing OpenRA tools to $(DATA_INSTALL_DIR)" @-echo "Installing OpenRA tools to $(DATA_INSTALL_DIR)"
@$(INSTALL_DIR) "$(DATA_INSTALL_DIR)" @$(INSTALL_DIR) "$(DATA_INSTALL_DIR)"
@@ -355,6 +352,13 @@ install-tools: tools
@$(INSTALL_PROGRAM) -m +rx openra-editor "$(BIN_INSTALL_DIR)" @$(INSTALL_PROGRAM) -m +rx openra-editor "$(BIN_INSTALL_DIR)"
@-$(RM) openra-editor @-$(RM) openra-editor
install-shortcuts: shortcuts
@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/icons/"
@$(CP_R) packaging/linux/hicolor/ "$(DESTDIR)$(datadir)/icons"
@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/applications"
@$(INSTALL_DATA) packaging/linux/openra.desktop "$(DESTDIR)$(datadir)/applications"
@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/applications" @$(INSTALL_DIR) "$(DESTDIR)$(datadir)/applications"
@$(INSTALL_DATA) packaging/linux/openra-editor.desktop "$(DESTDIR)$(datadir)/applications" @$(INSTALL_DATA) packaging/linux/openra-editor.desktop "$(DESTDIR)$(datadir)/applications"
@@ -391,6 +395,9 @@ help:
@echo to install with development tools, run: @echo to install with development tools, run:
@echo \ \ make \[prefix=/foo\] \[bindir=/bar/bin\] install-all @echo \ \ make \[prefix=/foo\] \[bindir=/bar/bin\] install-all
@echo @echo
@echo to install Linux desktop files and icons
@echo \ \ make install-shortcuts
@echo
@echo to uninstall, run: @echo to uninstall, run:
@echo \ \ make uninstall @echo \ \ make uninstall
@echo @echo

8
packaging/linux/buildpackage.sh
View File

@@ -15,10 +15,16 @@ ROOTDIR=root
# Clean up # Clean up
rm -rf $ROOTDIR rm -rf $ROOTDIR
# Copy files
cd ../.. 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" make install-all prefix="/usr" DESTDIR="$PWD/packaging/linux/$ROOTDIR"
# Launch scripts (executed by Desura)
cp *.sh "$PWD/packaging/linux/$ROOTDIR/usr/share/openra/" || exit 3
# Icons and .desktop files
make install-shortcuts
cd packaging/linux cd packaging/linux
( (