From 053baae068d01623362e940340dbc49b3d31379a Mon Sep 17 00:00:00 2001 From: truebrain Date: Thu, 16 Oct 2008 13:02:15 +0000 Subject: (svn r14477) -Fix r14474: also name the links in the .desktop file correclty upon install --- Makefile.bundle.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.bundle.in b/Makefile.bundle.in index f685c342c..66ee9c9e9 100644 --- a/Makefile.bundle.in +++ b/Makefile.bundle.in @@ -71,6 +71,7 @@ endif $(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 @@ ifdef MAN_DIR 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 -- cgit v1.2.3-70-g09d2