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

rename everything freedesktop.org related install-linux-*

Browse Source
This commit is contained in:
Matthias Mailänder
2014-05-31 09:51:44 +02:00
parent 9e4713dc0a
commit fe859c6fef
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Makefile
View File

@@ -18,8 +18,8 @@
# 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: # to install Linux startup scripts, desktop files and icons:
# make install-startup-scripts # make install-linux-shortcuts
# #
# to uninstall, run: # to uninstall, run:
# make uninstall # make uninstall
@@ -296,9 +296,9 @@ docs: utility
install: install-core install: install-core
install-all: install-core install-tools install-startup-scripts install-all: install-core install-tools
install-shortcuts: install-icons install-desktop install-linux-shortcuts: install-linux-scripts install-linux-icons install-linux-desktop
install-core: default install-core: default
@-echo "Installing OpenRA to $(DATA_INSTALL_DIR)" @-echo "Installing OpenRA to $(DATA_INSTALL_DIR)"
@@ -345,16 +345,16 @@ install-tools: tools
@$(INSTALL_DIR) "$(DATA_INSTALL_DIR)" @$(INSTALL_DIR) "$(DATA_INSTALL_DIR)"
@$(INSTALL_PROGRAM) $(foreach prog,$(TOOLS),$($(prog)_TARGET)) "$(DATA_INSTALL_DIR)" @$(INSTALL_PROGRAM) $(foreach prog,$(TOOLS),$($(prog)_TARGET)) "$(DATA_INSTALL_DIR)"
install-icons: install-linux-icons:
@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/icons/" @$(INSTALL_DIR) "$(DESTDIR)$(datadir)/icons/"
@$(CP_R) packaging/linux/hicolor/ "$(DESTDIR)$(datadir)/icons" @$(CP_R) packaging/linux/hicolor/ "$(DESTDIR)$(datadir)/icons"
install-desktop: install-linux-desktop:
@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/applications" @$(INSTALL_DIR) "$(DESTDIR)$(datadir)/applications"
@$(INSTALL_DATA) packaging/linux/openra.desktop "$(DESTDIR)$(datadir)/applications" @$(INSTALL_DATA) packaging/linux/openra.desktop "$(DESTDIR)$(datadir)/applications"
@$(INSTALL_DATA) packaging/linux/openra-editor.desktop "$(DESTDIR)$(datadir)/applications" @$(INSTALL_DATA) packaging/linux/openra-editor.desktop "$(DESTDIR)$(datadir)/applications"
install-startup-scripts: install-linux-scripts:
@echo "#!/bin/sh" > openra @echo "#!/bin/sh" > openra
@echo 'cd "$(gameinstalldir)"' >> openra @echo 'cd "$(gameinstalldir)"' >> openra
@echo 'exec mono OpenRA.Game.exe "$$@"' >> openra @echo 'exec mono OpenRA.Game.exe "$$@"' >> openra
@@ -402,8 +402,8 @@ 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 to install Linux startup scripts, desktop files and icons
@echo \ \ make install-startup-scripts @echo \ \ make install-linux-shortcuts
@echo @echo
@echo to uninstall, run: @echo to uninstall, run:
@echo \ \ make uninstall @echo \ \ make uninstall

4
packaging/linux/buildpackage.sh
View File

@@ -23,8 +23,8 @@ make install-all prefix="/usr" DESTDIR="$PWD/packaging/linux/$ROOTDIR"
cp $DEPSDIR/* $PWD/packaging/linux/$ROOTDIR/usr/lib/openra/ cp $DEPSDIR/* $PWD/packaging/linux/$ROOTDIR/usr/lib/openra/
# Icons and .desktop files # Install startup scripts, desktop files and icons
make install-shortcuts prefix="/usr" DESTDIR="$PWD/packaging/linux/$ROOTDIR" make install-linux-shortcuts prefix="/usr" DESTDIR="$PWD/packaging/linux/$ROOTDIR"
# Remove the WinForms dialog which is replaced with a native one provided by zenity # Remove the WinForms dialog which is replaced with a native one provided by zenity
rm $PWD/packaging/linux/$ROOTDIR/usr/lib/openra/OpenRA.CrashDialog.exe rm $PWD/packaging/linux/$ROOTDIR/usr/lib/openra/OpenRA.CrashDialog.exe