1 diff -rupN openmsx-catapult-0.7.2/build/main.mk openmsx-catapult-0.7.2-patched/build/main.mk
2 --- openmsx-catapult-0.7.2/build/main.mk 2009-06-28 16:46:27.000000000 +0100
3 +++ openmsx-catapult-0.7.2-patched/build/main.mk 2009-06-30 16:44:13.000000000 +0100
4 @@ -358,35 +358,40 @@ FILES_ONLY:=true
9 +# DESTDIR is a convention shared by at least GNU and FreeBSD to specify a path
10 +# prefix that will be used for all installed files.
11 +INSTALL_PREFIX:=$(if $(DESTDIR),$(DESTDIR)/,)
15 - @echo "Installing to $(CATAPULT_INSTALL):"
16 + @echo "Installing to $(INSTALL_PREFIX)$(CATAPULT_INSTALL):"
17 @echo " Executable..."
18 - @mkdir -p $(INSTALL_BINARY_DIR)
19 + @mkdir -p $(INSTALL_PREFIX)$(INSTALL_BINARY_DIR)
20 ifeq ($(CATAPULT_PREBUILT),true)
21 - @cp -f $(BINARY_FULL) $(INSTALL_BINARY_DIR)/$(BINARY_FILE)
22 + @cp -f $(BINARY_FULL) $(INSTALL_PREFIX)$(INSTALL_BINARY_DIR)/$(BINARY_FILE)
24 - @strip -o $(INSTALL_BINARY_DIR)/$(BINARY_FILE) $(BINARY_FULL)
25 + @strip -o $(INSTALL_PREFIX)$(INSTALL_BINARY_DIR)/$(BINARY_FILE) $(BINARY_FULL)
27 @echo " Data files..."
28 - @mkdir -p $(INSTALL_SHARE_DIR)
29 - @cp -rf $(RESOURCES_PATH) $(INSTALL_SHARE_DIR)/
30 + @mkdir -p $(INSTALL_PREFIX)$(INSTALL_SHARE_DIR)
31 + @cp -rf $(RESOURCES_PATH) $(INSTALL_PREFIX)$(INSTALL_SHARE_DIR)/
32 @echo " Documentation..."
33 - @mkdir -p $(INSTALL_DOC_DIR)
34 - @cp -f README $(INSTALL_DOC_DIR)
35 - @cp -f $(addprefix doc/,$(INSTALL_DOCS)) $(INSTALL_DOC_DIR)
36 - @mkdir -p $(INSTALL_DOC_DIR)/manual
37 + @mkdir -p $(INSTALL_PREFIX)$(INSTALL_DOC_DIR)
38 + @cp -f README $(INSTALL_PREFIX)$(INSTALL_DOC_DIR)
39 + @cp -f $(addprefix doc/,$(INSTALL_DOCS)) $(INSTALL_PREFIX)$(INSTALL_DOC_DIR)
40 + @mkdir -p $(INSTALL_PREFIX)$(INSTALL_DOC_DIR)/manual
41 @cp -f $(addprefix doc/manual/,*.html *.css *.png) \
42 - $(INSTALL_DOC_DIR)/manual
43 + $(INSTALL_PREFIX)$(INSTALL_DOC_DIR)/manual
44 ifeq ($(CATAPULT_PREBUILT),false)
45 ifneq ($(CATAPULT_NO_DESKTOP_HOOKS),true)
46 @echo " Desktop hooks..."
47 - @mkdir -p $(INSTALL_SHARE_DIR)/resources/icons
48 - @cp -rf src/catapult.xpm $(INSTALL_SHARE_DIR)/resources/icons
49 - @if [ -d /usr/share/applications -a -w /usr/share/applications ]; \
50 + @mkdir -p $(INSTALL_PREFIX)$(INSTALL_SHARE_DIR)/resources/icons
51 + @cp -rf src/catapult.xpm $(INSTALL_PREFIX)$(INSTALL_SHARE_DIR)/resources/icons
52 + @if [ -d $(INSTALL_PREFIX)/usr/share/applications -a -w $(INSTALL_PREFIX)/usr/share/applications ]; \
53 then sed -e "s|%INSTALL_BASE%|$(INSTALL_SHARE_DIR)|" \
54 desktop/openMSX-Catapult.desktop \
55 - > /usr/share/applications/openMSX-Catapult.desktop; \
56 + > $(INSTALL_PREFIX)/usr/share/applications/openMSX-Catapult.desktop; \
57 else mkdir -p ~/.local/share/applications && \
58 sed -e "s|%INSTALL_BASE%|$(INSTALL_SHARE_DIR)|" \
59 desktop/openMSX-Catapult.desktop \
60 @@ -405,7 +410,7 @@ ifeq ($(SYMLINK_FOR_BINARY),true)
63 @echo " Setting permissions..."
64 - @chmod -R a+rX $(INSTALL_SHARE_DIR)
65 + @chmod -R a+rX $(INSTALL_PREFIX)$(INSTALL_SHARE_DIR)
66 endif # CATAPULT_PREBUILT
67 @echo "Installation complete... have fun!"