diff options
author | Julian Ospald <hasufell@gentoo.org> | 2013-07-05 17:19:14 +0000 |
---|---|---|
committer | Julian Ospald <hasufell@gentoo.org> | 2013-07-05 17:19:14 +0000 |
commit | 5ea380fbea94dbc6ab56b0990eff771f83e8231c (patch) | |
tree | a421723a458890aead926bff48779d92e1288ffb /games-strategy | |
parent | Install unit file and drop old. (diff) | |
download | historical-5ea380fbea94dbc6ab56b0990eff771f83e8231c.tar.gz historical-5ea380fbea94dbc6ab56b0990eff771f83e8231c.tar.bz2 historical-5ea380fbea94dbc6ab56b0990eff771f83e8231c.zip |
fix non-fatal bug (crash when clicking on CREDITS), no revbump
Package-Manager: portage-2.2.0_alpha186/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3
Diffstat (limited to 'games-strategy')
-rw-r--r-- | games-strategy/openra/ChangeLog | 6 | ||||
-rw-r--r-- | games-strategy/openra/Manifest | 18 | ||||
-rw-r--r-- | games-strategy/openra/files/openra-20130514-makefile.patch | 103 |
3 files changed, 72 insertions, 55 deletions
diff --git a/games-strategy/openra/ChangeLog b/games-strategy/openra/ChangeLog index a3ced08e5475..65f247fbdb7c 100644 --- a/games-strategy/openra/ChangeLog +++ b/games-strategy/openra/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-strategy/openra # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/openra/ChangeLog,v 1.21 2013/07/04 12:42:06 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/openra/ChangeLog,v 1.22 2013/07/05 17:19:10 hasufell Exp $ + + 05 Jul 2013; Julian Ospald <hasufell@gentoo.org> + files/openra-20130514-makefile.patch: + fix non-fatal bug (crash when clicking on CREDITS), no revbump 04 Jul 2013; Julian Ospald <hasufell@gentoo.org> -openra-20130514.ebuild: remove old diff --git a/games-strategy/openra/Manifest b/games-strategy/openra/Manifest index b17acba92fec..c777fddaa176 100644 --- a/games-strategy/openra/Manifest +++ b/games-strategy/openra/Manifest @@ -3,23 +3,23 @@ Hash: SHA256 AUX README.gentoo 4754 SHA256 fe5d3a65472701fdfa44fe3e27aad694a13881932f75dbbba5c1fc3464ca006f SHA512 423c2682c3a9e69ccb078399ffec2ed2cb4bf1445c86db730756457e65f90d6f56c80e09b4f5e0b0eb0501a2a692d7d2add3847f77794aaf7555574a76c75392 WHIRLPOOL 1b3a698506170f86926548ee28cd9bccb3438f39baa961a47e26dad2c3f18c31df609c7dfbb46a89237c134c264c886417143fc5cfd1dccaaedf4b931f1d0b2e AUX openra-20120630-sound.patch 616 SHA256 6270dee1ead19c3abefdd1f3742cffbc0af9675f50d8fbcef5a0fb1a856ce16a SHA512 a6d04128fa53cdb70bb6d5de0b529ed283349c3748b3d3d455462f9ec6e3e5defeb49dede887072f52ffe4025b5f43ade42c66708a2deeacd82f06e1b1d68f1c WHIRLPOOL ff14e623e1e0daba621ab9eb701c3665bef32ef2bd838ddf22e181885ab1245f02b5c6f4fca3de95c12bc250ff1588eb1b0becd3897df8a2261d1ab66be9de65 -AUX openra-20130514-makefile.patch 12019 SHA256 9e9591c44da2336379bb8ad12114e87efff174789d4bf8a07c8b3658f0fc58e8 SHA512 8842ecb840f854acd343774db83cac6c312b9aff2380ecf0b57a1778c2a765ca133d712d92a0c424bf105ade0978c92ca2ace3b2d629dce3a47727ebad6c0278 WHIRLPOOL 311cf8188db7bea665afa8d1d7d451db483e38dff49705dfe36b3e9b7b5343b15f4ac75dad08ce86a41ba7770da73b96bd1d0b00ffd5a03adefce891dbb8e5d9 +AUX openra-20130514-makefile.patch 12143 SHA256 7426f60ebac6cd0130d1fb0e05785c2d71dd8ac6a66d7f7f06c6e9e00a69839f SHA512 2c071d2dcb7c8af9983d3c66cf2a0d522e313256250b36b4928abb734db52b18b0636746b466cc5b09b0527560979d05aac905f5ef5e213150a0cc5dc60e0447 WHIRLPOOL 921c4fda40ccbfb5e107b236abd9241ba438b4b6095377525795b636dcb315545e639fa2dfe20e45d6152cc582f74a26a01d19c2095e73ead5bbbffd47a4e0c2 DIST openra-20120630.tar.gz 10330304 SHA256 f95b9d41ea4b4094ea61519f6fb0185fa242af156e2ec26dc1f2d55197470a3c SHA512 ab5996a3f48d8be227edc029d3fa7948a80756a64bca65d1936c3f4480ef5258cb62365d079cc28ba2be59796db91326c4f8c8d500ea4d2bbf3a8439d783fceb WHIRLPOOL 390b5fa57ef322e6204a23006fc3a7755178d28e115fd52fa4ca5b46ecf58f8df61b44a90ba2fe143a7fadd0be42aaf3488c3b938eaea11171636b562dfe344d DIST openra-20121019.tar.gz 11338976 SHA256 016dd79f759c539889c290e7bd90b3faa92e88c35c6cd20789803b30135978e9 SHA512 199a88b2a34c05787e1d5ebced15975c76b2fb45d70c613db679e7faaa158942a7ddc842ff8e0f912e4e70beb3dab4f281e62dee76899fc67582ec8c067b3556 WHIRLPOOL bf694d4e94d35dd31343b127e7c4855b3bcf56cd6559d5f6a3c3f4ee9e40f627880e79ba599d5929d8c5b49643b93c09ee9d55f35c426d08526736190a9029a2 DIST openra-20130514.tar.gz 12592295 SHA256 0912303c7a02cf3907f618405c3605c56bcf30f053dcbbd110aba7dbad012210 SHA512 a9efddffb74b215cc9f5319f6b4613aa23116d328226c0cb428e8d2be97b03dfe45024c532c34e91d959434700a6170faa91a56b324aa2bfe1f1ce7ce96d46c4 WHIRLPOOL d91b911b76a7e3f6286f50d4d33beb6a7cb3e0035ef8b3331e6033e2487a13be8e8aac70fde30b7cbc139b71bd8bf5259a97ce0a642fcb386a3e5136223322ea EBUILD openra-20120630.ebuild 2040 SHA256 b3c3891ad26a81d27d4c8a68eed507026d4ce5f47eaae9fb4f485de8be114aad SHA512 a2c9fad65e1791464d6c40da95680eca2c11d745598ca2572d24783fdaf2b6d70b5a142b6938d2407b49415dad46ca53049aae15bf77c820e29bcf947afc6ed2 WHIRLPOOL 0eaf9e7aac412df5cc8d284bbe36e191c6d954dfc8fe610177b894572f7c508f2dedc7c5d5ec8e9a8ffee5e54e4f81acce4d4bc9959380447c7e6a85d5de4baf EBUILD openra-20121019.ebuild 2107 SHA256 13e09c553eefe18ab63a4adfc1bf8b5e7bf8d761d6a7b1c3f911a630e62ab887 SHA512 594822765e56ee6507f2bec899638736ea664bfd8bc7428608a7fc5fec0ec5cf88f912c9e5ea653a56d52eda753a9e537d589ef8b7aeaf308cc22641068d5c5b WHIRLPOOL 02a73b867ea0f10069fd9626d5a9a10e529302710e0b7749bb12db3b9c56428751ddf9e20aa1ef695395be124601ce2c125211f6ab169ec7000336057bc8aac0 EBUILD openra-20130514-r1.ebuild 2262 SHA256 65bf2d2f008397df715bc0a94de699c981b6c26305f1ac473a5d0a97c176640c SHA512 8248264cd229d14a5a2525fde21fcad997d0ea9190f27dc4b1ebca98fee2558bc07f9ee22a5f4e9314300c6a5467cd9bb2284c186b038bf8ccc540d853abf781 WHIRLPOOL 461e7b838beb2051d8b4f6b4c197bff1f9ed9b8400f0042e87da354be69e83e8804d554b895801ebdda204cbee4c0d356a5705427998cb4e2c1191e20c0744cb -MISC ChangeLog 2773 SHA256 f8fe7ee7eb06d0d35f745319f53deb24f2691c8b578685f7a2aae4a5a98bb53c SHA512 1bbfd75ee163a0f3b8bded4f060001bc35157adc4e2c8b576c396fe09c4b83f8abfc7b5ab1c91e38c5f49a48e5794c54af25798c98045f91c2e1e4485fb366ec WHIRLPOOL 543220bb6c35e0ffecfe14a824e9fcc754fac14c18ef3bf12ab2c9574b5bdac9b1b768e00e55a361407d0cbae40c6331248fbcff8856f7c2884c1beacd1cf143 +MISC ChangeLog 2930 SHA256 256c96fc2729e00bf36e5418b8bf88300fe92bab844deb38c1aac74ab6c78ef0 SHA512 f3bd694c8454afd93f912b4182081cc4544b634bed62f06758068a6e92c1685e8f759b26c1526ec1af4f3a8e21d230748bfe8c74c9ea80f6b8a7115315eb839a WHIRLPOOL 7cd5db037f37722c3cb815711a3f2713f76a924b5ecf91cca4f4ef1f0ad2dc03c05ae12acddbf01a42463bfdd083c8e7755464365362e8f5d500bc74cd63cfd5 MISC metadata.xml 814 SHA256 d2ef2dd5e230dd87190de36198e86a1cd368837e1c71de2212b63d0c18831d81 SHA512 1712ccc1d0f096de8da71119e21060586c2b7e232b21b85a4a34df3d5682116abf784be03cd753a64b6f34277e1e347b0295ead2cee8d8ac0aa5468421156379 WHIRLPOOL f5aa621739cd3506a768e405d9c57ef3095237c10bbe0d5fcba05ad8616307f012101928b7985c507af1f8bbffaf88b2431615cc2db5d0af2c74ab97c2c1c433 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (GNU/Linux) -iQEcBAEBCAAGBQJR1W2jAAoJEFpvPKfnPDWzmvwH/jfsuN2MvOBWzfcdJIZmBbEV -x4XjYz5Hbk6Uo/iVLRHTyKLS5AZWghpoM9h6Dl4zzRrPHSSpmB6JkX/0PP1qpGFy -ycJtnZ9R+qLRgqd6q8jBNH1dd0KESo7hFUYBKfGLWg9PXF/ToI/+G7Idqo9R2ECG -MAnKmzKMS/G5YpF2nT1W+HlOi6qlQGVNOULbObmZHR1QQVHFgRC/Z8niioCSNPOp -A79RBEiH6a/zTw63vUpMz1IiDWmhoIXJ11gcHKJsVzs2Ksqg4ERJt0qFAQAJwL3t -vd59oBUWPsjqyAaUpDa9xHwOY/EQ3d6NDRgfYIE2UCTjAMor9tAanycy968xKhA= -=XXES +iQEcBAEBCAAGBQJR1wASAAoJEFpvPKfnPDWz5YkIAJjIntRZIgajzV1DN4txegjm +bztDS5cD8Wq8wxlwP5c16zZ8Lztxe8GDrEeC6AqgMG6e+SPkprnJ0D90UuFgHUep +RprcInTd2U1wJpMfT1uYOBZ5FlW/kF5Q8q3iTJq55ImKTLGQv03WhWENl6F0nKvf +iw9RdrSRPNQuT75F/9PCcX2ZO4wYW1cTOcu9OXgunrF5mrARQq/spk4cRcGp/yeA +PaWyB0h/nsPXsgAwq9y4c/O2B/leM1IL9edYvnY+TcSTaf+YmQ6uw/jUEg5z2jvb +/fOyiSf/H+S6Cf3FVQH/Cy1yjD5rOcDnfGST28M4RcK0odgWVS+3lF2EFKVnCGQ= +=heTo -----END PGP SIGNATURE----- diff --git a/games-strategy/openra/files/openra-20130514-makefile.patch b/games-strategy/openra/files/openra-20130514-makefile.patch index 7bc9e5486684..537b688c7dfb 100644 --- a/games-strategy/openra/files/openra-20130514-makefile.patch +++ b/games-strategy/openra/files/openra-20130514-makefile.patch @@ -1,7 +1,5 @@ https://github.com/OpenRA/OpenRA/pull/3500 -diff --git a/Makefile b/Makefile -index 343d413..291eb4d 100644 --- a/Makefile +++ b/Makefile @@ -1,34 +1,69 @@ @@ -85,9 +83,11 @@ index 343d413..291eb4d 100644 - mv -f $${i}.tmp $${i} ; \ - done -default: dependencies core - +- -.DEFAULT_GOAL := default - +- ++ ++ +######################## PROGRAM TARGET RULES ########################## # # Core binaries @@ -95,7 +95,7 @@ index 343d413..291eb4d 100644 fileformats_SRCS := $(shell find OpenRA.FileFormats/ -iname '*.cs') fileformats_TARGET = OpenRA.FileFormats.dll fileformats_KIND = library -@@ -39,16 +74,14 @@ fileformats: $(fileformats_TARGET) +@@ -39,16 +74,14 @@ game_SRCS := $(shell find OpenRA.Game/ -iname '*.cs') game_TARGET = OpenRA.Game.exe game_KIND = winexe @@ -113,7 +113,7 @@ index 343d413..291eb4d 100644 rsdl_SRCS := $(shell find OpenRA.Renderer.SdlCommon/ -iname '*.cs') rsdl_TARGET = OpenRA.Renderer.SdlCommon.dll rsdl_KIND = library -@@ -82,14 +115,13 @@ rnull_LIBS = $(COMMON_LIBS) System.Windows.Forms.dll \ +@@ -82,19 +115,18 @@ PROGRAMS += rcg rgl rnull rsdl renderers: $(rcg_TARGET) $(rgl_TARGET) $(rnull_TARGET) $(rsdl_TARGET) @@ -131,7 +131,14 @@ index 343d413..291eb4d 100644 mod_ra_SRCS := $(shell find OpenRA.Mods.RA/ -iname '*.cs') mod_ra_TARGET = mods/ra/OpenRA.Mods.RA.dll mod_ra_KIND = library -@@ -119,9 +151,9 @@ mod_d2k_EXTRA_CMDS = mono --debug RALint.exe d2k +-mod_ra_DEPS = $(STD_MOD_DEPS) +-mod_ra_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) ++mod_ra_DEPS = $(STD_MOD_DEPS) $(utility_TARGET) ++mod_ra_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) $(utility_TARGET) + mod_ra_EXTRA_CMDS = mono --debug RALint.exe ra + PROGRAMS += mod_ra + mod_ra: $(mod_ra_TARGET) +@@ -119,9 +151,9 @@ PROGRAMS += mod_d2k mod_d2k: $(mod_d2k_TARGET) @@ -144,7 +151,7 @@ index 343d413..291eb4d 100644 # Map Editor editor_SRCS := $(shell find OpenRA.Editor/ -iname '*.cs') editor_TARGET = OpenRA.Editor.exe -@@ -163,13 +195,8 @@ OpenRA.TilesetBuilder.Surface.resources: +@@ -163,13 +195,8 @@ resgen2 OpenRA.TilesetBuilder/Surface.resx OpenRA.TilesetBuilder.Surface.resources 1> /dev/null tsbuild: OpenRA.TilesetBuilder.frmBuilder.resources OpenRA.TilesetBuilder.frmNew.resources OpenRA.TilesetBuilder.Surface.resources $(tsbuild_TARGET) @@ -160,13 +167,14 @@ index 343d413..291eb4d 100644 # Backend for the launcher apps - queries game/mod info and applies actions to an install utility_SRCS := $(shell find OpenRA.Utility/ -iname '*.cs') -@@ -180,11 +207,13 @@ utility_LIBS = $(COMMON_LIBS) $(utility_DEPS) thirdparty/ICSharpCode.Shar +@@ -180,11 +207,13 @@ PROGRAMS += utility utility: $(utility_TARGET) -.PHONY: $(PHONY) $(PROGRAMS) - +- -# ++ +# Patches binary headers to work around a mono bug +fixheader.exe: packaging/fixheader.cs + @echo CSC fixheader.exe @@ -177,13 +185,11 @@ index 343d413..291eb4d 100644 define BUILD_ASSEMBLY $$($(1)_TARGET): $$($(1)_SRCS) Makefile $$($(1)_DEPS) fixheader.exe -@@ -203,68 +232,65 @@ endef +@@ -203,68 +232,67 @@ $(foreach prog,$(PROGRAMS),$(eval $(call BUILD_ASSEMBLY,$(prog)))) -+ -+########################## MAKE/INSTALL RULES ########################## - # +-# -# Install / Uninstall for *nix -# -prefix ?= /usr/local @@ -195,6 +201,9 @@ index 343d413..291eb4d 100644 -INSTALL = install -INSTALL_PROGRAM = $(INSTALL) -CORE = fileformats rcg rgl rsdl rnull game editor utility tsbuild ++ ++########################## MAKE/INSTALL RULES ########################## ++# +default: dependencies core + +core: game renderers mods utility tsbuild @@ -278,65 +287,69 @@ index 343d413..291eb4d 100644 + +install-core: default + @-echo "Installing OpenRA to $(DATA_INSTALL_DIR)" -+ @$(INSTALL_DIR) $(DATA_INSTALL_DIR) -+ @$(INSTALL_PROGRAM) $(foreach prog,$(CORE),$($(prog)_TARGET)) $(DATA_INSTALL_DIR) -+ @$(INSTALL_DIR) $(DATA_INSTALL_DIR)/mods -+ @$(CP_R) mods/cnc $(DATA_INSTALL_DIR)/mods/ -+ @$(INSTALL_PROGRAM) $(mod_cnc_TARGET) $(DATA_INSTALL_DIR)/mods/cnc -+ @$(CP_R) mods/ra $(DATA_INSTALL_DIR)/mods/ -+ @$(INSTALL_PROGRAM) $(mod_ra_TARGET) $(DATA_INSTALL_DIR)/mods/ra -+ @$(CP_R) mods/d2k $(DATA_INSTALL_DIR)/mods/ -+ @$(INSTALL_PROGRAM) $(mod_d2k_TARGET) $(DATA_INSTALL_DIR)/mods/d2k -+ -+ @$(CP_R) glsl $(DATA_INSTALL_DIR) -+ @$(CP_R) cg $(DATA_INSTALL_DIR) -+ @$(CP) *.ttf $(DATA_INSTALL_DIR) -+ @$(CP) thirdparty/Tao/* $(DATA_INSTALL_DIR) -+ @$(INSTALL_PROGRAM) thirdparty/ICSharpCode.SharpZipLib.dll $(DATA_INSTALL_DIR) -+ @$(INSTALL_PROGRAM) thirdparty/FuzzyLogicLibrary.dll $(DATA_INSTALL_DIR) -+ @$(INSTALL_PROGRAM) thirdparty/SharpFont.dll $(DATA_INSTALL_DIR) -+ @$(CP) thirdparty/SharpFont.dll.config $(DATA_INSTALL_DIR) -+ @$(INSTALL_PROGRAM) thirdparty/Mono.Nat.dll $(DATA_INSTALL_DIR) ++ @$(INSTALL_DIR) "$(DATA_INSTALL_DIR)" ++ @$(INSTALL_PROGRAM) $(foreach prog,$(CORE),$($(prog)_TARGET)) "$(DATA_INSTALL_DIR)" ++ @$(INSTALL_DIR) "$(DATA_INSTALL_DIR)/mods" ++ @$(CP_R) mods/cnc "$(DATA_INSTALL_DIR)/mods/" ++ @$(INSTALL_PROGRAM) $(mod_cnc_TARGET) "$(DATA_INSTALL_DIR)/mods/cnc" ++ @$(CP_R) mods/ra "$(DATA_INSTALL_DIR)/mods/" ++ @$(INSTALL_PROGRAM) $(mod_ra_TARGET) "$(DATA_INSTALL_DIR)/mods/ra" ++ @$(CP_R) mods/d2k "$(DATA_INSTALL_DIR)/mods/" ++ @$(INSTALL_PROGRAM) $(mod_d2k_TARGET) "$(DATA_INSTALL_DIR)/mods/d2k" ++ ++ @$(INSTALL_DATA) AUTHORS "$(DATA_INSTALL_DIR)/AUTHORS" ++ ++ @$(CP_R) glsl "$(DATA_INSTALL_DIR)" ++ @$(CP_R) cg "$(DATA_INSTALL_DIR)" ++ @$(CP) *.ttf "$(DATA_INSTALL_DIR)" ++ @$(CP) thirdparty/Tao/* "$(DATA_INSTALL_DIR)" ++ @$(INSTALL_PROGRAM) thirdparty/ICSharpCode.SharpZipLib.dll "$(DATA_INSTALL_DIR)" ++ @$(INSTALL_PROGRAM) thirdparty/FuzzyLogicLibrary.dll "$(DATA_INSTALL_DIR)" ++ @$(INSTALL_PROGRAM) thirdparty/SharpFont.dll "$(DATA_INSTALL_DIR)" ++ @$(CP) thirdparty/SharpFont.dll.config "$(DATA_INSTALL_DIR)" ++ @$(INSTALL_PROGRAM) thirdparty/Mono.Nat.dll "$(DATA_INSTALL_DIR)" @echo "#!/bin/sh" > openra @echo 'BINDIR=$$(dirname $$(readlink -f $$0))' >> openra -@@ -273,6 +299,16 @@ install: all +@@ -273,6 +301,16 @@ @echo 'cd "$${DATADIR}/openra"' >> openra @echo 'exec mono OpenRA.Game.exe "$$@"' >> openra -+ @$(INSTALL_DIR) $(BIN_INSTALL_DIR) -+ @$(INSTALL_PROGRAM) -m +rx openra $(BIN_INSTALL_DIR) ++ @$(INSTALL_DIR) "$(BIN_INSTALL_DIR)" ++ @$(INSTALL_PROGRAM) -m +rx openra "$(BIN_INSTALL_DIR)" + + @-$(RM) openra + +install-tools: tools + @-echo "Installing OpenRA tools to $(DATA_INSTALL_DIR)" -+ @$(INSTALL_DIR) $(DATA_INSTALL_DIR) -+ @$(INSTALL_PROGRAM) $(foreach prog,$(TOOLS),$($(prog)_TARGET)) $(DATA_INSTALL_DIR) ++ @$(INSTALL_DIR) "$(DATA_INSTALL_DIR)" ++ @$(INSTALL_PROGRAM) $(foreach prog,$(TOOLS),$($(prog)_TARGET)) "$(DATA_INSTALL_DIR)" + @echo "#!/bin/sh" > openra-editor @echo 'BINDIR=$$(dirname $$(readlink -f $$0))' >> openra-editor @echo 'ROOTDIR="$${BINDIR%'"$(bindir)"'}"' >> openra-editor -@@ -280,14 +316,42 @@ install: all +@@ -280,14 +318,42 @@ @echo 'cd "$${DATADIR}/openra"' >> openra-editor @echo 'exec mono OpenRA.Editor.exe "$$@"' >> openra-editor - @$(INSTALL_PROGRAM) -d $(BIN_INSTALL_DIR) - @$(INSTALL_PROGRAM) -m +rx openra $(BIN_INSTALL_DIR) -+ @$(INSTALL_DIR) $(BIN_INSTALL_DIR) - @$(INSTALL_PROGRAM) -m +rx openra-editor $(BIN_INSTALL_DIR) - +- @$(INSTALL_PROGRAM) -m +rx openra-editor $(BIN_INSTALL_DIR) +- - @-rm openra - @-rm openra-editor ++ @$(INSTALL_DIR) "$(BIN_INSTALL_DIR)" ++ @$(INSTALL_PROGRAM) -m +rx openra-editor "$(BIN_INSTALL_DIR)" ++ + @-$(RM) openra-editor uninstall: - @-rm -r $(INSTALL_DIR) - @-rm $(DESTDIR)$(bindir)/openra - @-rm $(DESTDIR)$(bindir)/openra-editor -+ @-$(RM_R) $(DATA_INSTALL_DIR) -+ @-$(RM_F) $(BIN_INSTALL_DIR)/openra -+ @-$(RM_F) $(BIN_INSTALL_DIR)/openra-editor ++ @-$(RM_R) "$(DATA_INSTALL_DIR)" ++ @-$(RM_F) "$(BIN_INSTALL_DIR)/openra" ++ @-$(RM_F) "$(BIN_INSTALL_DIR)/openra-editor" + +help: + @echo to compile, run: |