From e72e6e236c7b4d36231ecb1fe2af661290fbd9de Mon Sep 17 00:00:00 2001 From: Fincer Date: Sat, 11 Mar 2017 11:55:22 +0200 Subject: [PATCH] Fix outdated patch [Linux] --- data/patches/linux/linux-d2-ra2-make.patch | 16 ++++++---------- data/patches/linux/linux-ra2-make.patch | 20 ++++++++++---------- 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/data/patches/linux/linux-d2-ra2-make.patch b/data/patches/linux/linux-d2-ra2-make.patch index 2e64059..f65f585 100644 --- a/data/patches/linux/linux-d2-ra2-make.patch +++ b/data/patches/linux/linux-d2-ra2-make.patch @@ -69,19 +69,15 @@ +mods: mod_common mod_cnc mod_d2k mod_ra2 mod_d2 all: dependencies core tools - -@@ -364,10 +394,14 @@ - @$(INSTALL_DIR) "$(DATA_INSTALL_DIR)/mods" - @$(CP_R) mods/common "$(DATA_INSTALL_DIR)/mods/" - @$(INSTALL_PROGRAM) $(mod_common_TARGET) "$(DATA_INSTALL_DIR)/mods/common" -+ @$(CP_R) mods/ra2 "$(DATA_INSTALL_DIR)/mods/" -+ @$(INSTALL_PROGRAM) $(mod_ra2_TARGET) "$(DATA_INSTALL_DIR)/mods/ra2" + +@@ -368,6 +398,10 @@ @$(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/" @$(CP_R) mods/d2k "$(DATA_INSTALL_DIR)/mods/" - @$(INSTALL_PROGRAM) $(mod_d2k_TARGET) "$(DATA_INSTALL_DIR)/mods/d2k" ++ @$(CP_R) mods/ra2 "$(DATA_INSTALL_DIR)/mods/" + @$(CP_R) mods/d2 "$(DATA_INSTALL_DIR)/mods/" ++ @$(INSTALL_PROGRAM) $(mod_ra2_TARGET) "$(DATA_INSTALL_DIR)/mods/ra2" + @$(INSTALL_PROGRAM) $(mod_d2_TARGET) "$(DATA_INSTALL_DIR)/mods/d2" + @$(INSTALL_PROGRAM) $(mod_d2k_TARGET) "$(DATA_INSTALL_DIR)/mods/d2k" @$(CP_R) mods/modchooser "$(DATA_INSTALL_DIR)/mods/" - @$(INSTALL_DATA) "global mix database.dat" "$(DATA_INSTALL_DIR)/global mix database.dat" diff --git a/data/patches/linux/linux-ra2-make.patch b/data/patches/linux/linux-ra2-make.patch index f19bcf4..bd4e24d 100644 --- a/data/patches/linux/linux-ra2-make.patch +++ b/data/patches/linux/linux-ra2-make.patch @@ -1,5 +1,5 @@ ---- a/Makefile -+++ b/Makefile +--- Makefile 2017-03-11 11:36:14.104436756 +0200 ++++ Makefile.patched.ra2d2 2017-03-11 11:41:29.217438271 +0200 @@ -155,6 +155,15 @@ PROGRAMS += mod_cnc mod_cnc: $(mod_cnc_TARGET) @@ -44,13 +44,13 @@ +mods: mod_common mod_cnc mod_d2k mod_ra2 all: dependencies core tools - -@@ -364,6 +379,8 @@ - @$(INSTALL_DIR) "$(DATA_INSTALL_DIR)/mods" - @$(CP_R) mods/common "$(DATA_INSTALL_DIR)/mods/" - @$(INSTALL_PROGRAM) $(mod_common_TARGET) "$(DATA_INSTALL_DIR)/mods/common" -+ @$(CP_R) mods/ra2 "$(DATA_INSTALL_DIR)/mods/" -+ @$(INSTALL_PROGRAM) $(mod_ra2_TARGET) "$(DATA_INSTALL_DIR)/mods/ra2" + +@@ -368,6 +383,8 @@ @$(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/" @$(CP_R) mods/d2k "$(DATA_INSTALL_DIR)/mods/" ++ @$(CP_R) mods/ra2 "$(DATA_INSTALL_DIR)/mods/" ++ @$(INSTALL_PROGRAM) $(mod_ra2_TARGET) "$(DATA_INSTALL_DIR)/mods/ra2" + @$(INSTALL_PROGRAM) $(mod_d2k_TARGET) "$(DATA_INSTALL_DIR)/mods/d2k" + @$(CP_R) mods/modchooser "$(DATA_INSTALL_DIR)/mods/" +