(svn r14477) -Fix r14474: also name the links in the .desktop file correclty upon install
authortruebrain
Thu, 16 Oct 2008 13:02:15 +0000
changeset 10247 b4bed389d825
parent 10246 d1227bb654b8
child 10248 f0297aac2ff2
(svn r14477) -Fix r14474: also name the links in the .desktop file correclty upon install
Makefile.bundle.in
--- a/Makefile.bundle.in	Thu Oct 16 12:19:24 2008 +0000
+++ b/Makefile.bundle.in	Thu Oct 16 13:02:15 2008 +0000
@@ -71,6 +71,7 @@
 	$(Q)cp "$(ROOT_DIR)/media/openttd."*.png  "$(BUNDLE_DIR)/media/"
 ifdef MENU_DIR
 	$(Q)cp "$(ROOT_DIR)/media/openttd.desktop" "$(BUNDLE_DIR)/media/"
+	$(Q)cat "$(ROOT_DIR)/media/openttd.desktop" | sed s/=openttd/=$(BINARY_NAME)/g > "$(ROOT_DIR)/media/openttd.desktop.install"
 endif
 ifeq ($(shell if test -n "`ls -l \"$(BIN_DIR)/scenario/\"*.scn 2> /dev/null`"; then echo 1; fi), 1)
 	$(Q)cp "$(BIN_DIR)/scenario/"*.scn        "$(BUNDLE_DIR)/scenario/"
@@ -175,7 +176,7 @@
 endif
 ifdef MENU_DIR
 	$(Q)install -d "$(INSTALL_MENU_DIR)"
-	$(Q)install -m 644 "$(BUNDLE_DIR)/media/openttd.desktop" "$(INSTALL_MENU_DIR)/${BINARY_NAME}.desktop"
+	$(Q)install -m 644 "$(ROOT_DIR)/media/openttd.desktop.install" "$(INSTALL_MENU_DIR)/${BINARY_NAME}.desktop"
 endif
 	$(Q)cp -R "$(BUNDLE_DIR)/scenario" "$(INSTALL_DATA_DIR)"
 endif # OSXAPP