Skip to content

Commit f6c607c

Browse files
committed
Fix makefile install rule.
1 parent 8d2531f commit f6c607c

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

Makefile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -364,8 +364,9 @@ install-core: default
364364
@$(INSTALL_DIR) "$(DATA_INSTALL_DIR)/mods"
365365
@$(CP_R) mods/common "$(DATA_INSTALL_DIR)/mods/"
366366
@$(INSTALL_PROGRAM) $(mod_common_TARGET) "$(DATA_INSTALL_DIR)/mods/common"
367+
@$(INSTALL_PROGRAM) $(mod_cnc_TARGET) "$(DATA_INSTALL_DIR)/mods/common"
367368
@$(CP_R) mods/cnc "$(DATA_INSTALL_DIR)/mods/"
368-
@$(INSTALL_PROGRAM) $(mod_cnc_TARGET) "$(DATA_INSTALL_DIR)/mods/cnc"
369+
@$(CP_R) mods/ra "$(DATA_INSTALL_DIR)/mods/"
369370
@$(CP_R) mods/d2k "$(DATA_INSTALL_DIR)/mods/"
370371
@$(INSTALL_PROGRAM) $(mod_d2k_TARGET) "$(DATA_INSTALL_DIR)/mods/d2k"
371372
@$(CP_R) mods/modchooser "$(DATA_INSTALL_DIR)/mods/"
@@ -427,9 +428,9 @@ install-linux-scripts:
427428
@echo 'cd "$(gameinstalldir)"' >> openra
428429
# Note: this relies on the non-standard -f flag implemented by gnu readlink
429430
ifeq ($(DEBUG), $(filter $(DEBUG),false no n off 0))
430-
@echo 'mono OpenRA.Game.exe Engine.LaunchPath="$(readlink -f $0)" "$$@"' >> openra
431+
@echo 'mono OpenRA.Game.exe Engine.LaunchPath="$$(readlink -f $$0)" "$$@"' >> openra
431432
else
432-
@echo 'mono --debug OpenRA.Game.exe Engine.LaunchPath="$(readlink -f $0)" "$$@"' >> openra
433+
@echo 'mono --debug OpenRA.Game.exe Engine.LaunchPath="$$(readlink -f $$0)" "$$@"' >> openra
433434
endif
434435
@echo 'if [ $$? != 0 -a $$? != 1 ]' >> openra
435436
@echo 'then' >> openra

0 commit comments

Comments
 (0)