Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 215776 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile.in (+1 lines)
Lines 28-33 Link Here
28 
INSTALL_ICON_THEME_DIR = "$(INSTALL_DIR)/$(ICON_THEME_DIR)"
 28 
INSTALL_ICON_THEME_DIR = "$(INSTALL_DIR)/$(ICON_THEME_DIR)"
29 
INSTALL_DATA_DIR = "$(INSTALL_DIR)/"!!DATA_DIR!!
 29 
INSTALL_DATA_DIR = "$(INSTALL_DIR)/"!!DATA_DIR!!
30 
INSTALL_DOC_DIR = "$(INSTALL_DIR)/"!!DOC_DIR!!
 30 
INSTALL_DOC_DIR = "$(INSTALL_DIR)/"!!DOC_DIR!!
31 
BINARY_NAME = !!BINARY_NAME!!
31 
TTD = !!TTD!!
 32 
TTD = !!TTD!!
32 
TTDS = $(SRC_DIRS:%=%/$(TTD))
 33 
TTDS = $(SRC_DIRS:%=%/$(TTD))
33 
OS = !!OS!!
 34 
OS = !!OS!!
(-)Makefile.bundle.in (-10 / +16 lines)
Lines 139-173 Link Here
139 
	$(Q)install -d "$(INSTALL_DATA_DIR)/data"
 140 
	$(Q)install -d "$(INSTALL_DATA_DIR)/data"
140 
	$(Q)install -d "$(INSTALL_DATA_DIR)/lang"
 141 
	$(Q)install -d "$(INSTALL_DATA_DIR)/lang"
141 
	$(Q)install -d "$(INSTALL_DOC_DIR)"
 142 
	$(Q)install -d "$(INSTALL_DOC_DIR)"
142 
	$(Q)install -m 755 "$(BUNDLE_DIR)/$(TTD)" "$(INSTALL_BINARY_DIR)"
 143 
ifeq ($(TTD), openttd.exe)
144 
	$(Q)install -m 755 "$(BUNDLE_DIR)/$(TTD)" "$(INSTALL_BINARY_DIR)/${BINARY_NAME}.exe"
145 
else
146 
	$(Q)install -m 755 "$(BUNDLE_DIR)/$(TTD)" "$(INSTALL_BINARY_DIR)/${BINARY_NAME}"
147 
endif
143 
	$(Q)install -m 644 "$(BUNDLE_DIR)/lang/"* "$(INSTALL_DATA_DIR)/lang"
 148 
	$(Q)install -m 644 "$(BUNDLE_DIR)/lang/"* "$(INSTALL_DATA_DIR)/lang"
144 
	$(Q)install -m 644 "$(BUNDLE_DIR)/data/"* "$(INSTALL_DATA_DIR)/data"
 149 
	$(Q)install -m 644 "$(BUNDLE_DIR)/data/"* "$(INSTALL_DATA_DIR)/data"
145 
	$(Q)install -m 644 "$(BUNDLE_DIR)/docs/"* "$(INSTALL_DOC_DIR)"
 150 
	$(Q)install -m 644 "$(BUNDLE_DIR)/docs/"* "$(INSTALL_DOC_DIR)"
146 
	$(Q)install -m 644 "$(BUNDLE_DIR)/media/openttd.32.xpm" "$(INSTALL_ICON_DIR)"
 151 
	$(Q)install -m 644 "$(BUNDLE_DIR)/"*.txt "$(INSTALL_DOC_DIR)"
152 
	$(Q)install -m 644 "$(BUNDLE_DIR)/COPYING" "$(INSTALL_DOC_DIR)"
153 
	$(Q)install -m 644 "$(BUNDLE_DIR)/media/openttd.32.xpm" "$(INSTALL_ICON_DIR)/${BINARY_NAME}.32.xpm"
147 
ifdef ICON_THEME_DIR
 154 
ifdef ICON_THEME_DIR
148 
	$(Q)install -d "$(INSTALL_ICON_THEME_DIR)"
 155 
	$(Q)install -d "$(INSTALL_ICON_THEME_DIR)"
149 
	$(Q)install -d "$(INSTALL_ICON_THEME_DIR)/16x16/apps"
 156 
	$(Q)install -d "$(INSTALL_ICON_THEME_DIR)/16x16/apps"
150 
	$(Q)install -m 644 "$(BUNDLE_DIR)/media/openttd.16.png" "$(INSTALL_ICON_THEME_DIR)/16x16/apps"
 157 
	$(Q)install -m 644 "$(BUNDLE_DIR)/media/openttd.16.png" "$(INSTALL_ICON_THEME_DIR)/16x16/apps/${BINARY_NAME}.png"
151 
	$(Q)install -d "$(INSTALL_ICON_THEME_DIR)/32x32/apps"
 158 
	$(Q)install -d "$(INSTALL_ICON_THEME_DIR)/32x32/apps"
152 
	$(Q)install -m 644 "$(BUNDLE_DIR)/media/openttd.32.png" "$(INSTALL_ICON_THEME_DIR)/32x32/apps"
 159 
	$(Q)install -m 644 "$(BUNDLE_DIR)/media/openttd.32.png" "$(INSTALL_ICON_THEME_DIR)/32x32/apps/${BINARY_NAME}.png"
153 
	$(Q)install -d "$(INSTALL_ICON_THEME_DIR)/48x48/apps"
 160 
	$(Q)install -d "$(INSTALL_ICON_THEME_DIR)/48x48/apps"
154 
	$(Q)install -m 644 "$(BUNDLE_DIR)/media/openttd.48.png" "$(INSTALL_ICON_THEME_DIR)/48x48/apps"
 161 
	$(Q)install -m 644 "$(BUNDLE_DIR)/media/openttd.48.png" "$(INSTALL_ICON_THEME_DIR)/48x48/apps/${BINARY_NAME}.png"
155 
	$(Q)install -d "$(INSTALL_ICON_THEME_DIR)/64x64/apps"
 162 
	$(Q)install -d "$(INSTALL_ICON_THEME_DIR)/64x64/apps"
156 
	$(Q)install -m 644 "$(BUNDLE_DIR)/media/openttd.64.png" "$(INSTALL_ICON_THEME_DIR)/64x64/apps"
 163 
	$(Q)install -m 644 "$(BUNDLE_DIR)/media/openttd.64.png" "$(INSTALL_ICON_THEME_DIR)/64x64/apps/${BINARY_NAME}.png"
157 
	$(Q)install -d "$(INSTALL_ICON_THEME_DIR)/128x128/apps"
 164 
	$(Q)install -d "$(INSTALL_ICON_THEME_DIR)/128x128/apps"
158 
	$(Q)install -m 644 "$(BUNDLE_DIR)/media/openttd.128.png" "$(INSTALL_ICON_THEME_DIR)/128x128/apps"
 165 
	$(Q)install -m 644 "$(BUNDLE_DIR)/media/openttd.128.png" "$(INSTALL_ICON_THEME_DIR)/128x128/apps/${BINARY_NAME}.png"
159 
	$(Q)install -d "$(INSTALL_ICON_THEME_DIR)/256x256/apps"
 166 
	$(Q)install -d "$(INSTALL_ICON_THEME_DIR)/256x256/apps"
160 
	$(Q)install -m 644 "$(BUNDLE_DIR)/media/openttd.256.png" "$(INSTALL_ICON_THEME_DIR)/256x256/apps"
 167 
	$(Q)install -m 644 "$(BUNDLE_DIR)/media/openttd.256.png" "$(INSTALL_ICON_THEME_DIR)/256x256/apps/${BINARY_NAME}.png"
161 
else
 168 
else
162 
	$(Q)install -m 644 "$(BUNDLE_DIR)/media/"*.png "$(INSTALL_ICON_DIR)"
 169 
	$(Q)install -m 644 "$(BUNDLE_DIR)/media/"*.png "$(INSTALL_ICON_DIR)"
163 
endif
 170 
endif
164 
ifdef MAN_DIR
 171 
ifdef MAN_DIR
165 
	$(Q)install -d "$(INSTALL_MAN_DIR)"
 172 
	$(Q)install -d "$(INSTALL_MAN_DIR)"
166 
	$(Q)install -m 644 "$(BUNDLE_DIR)/man/openttd.6.gz" "$(INSTALL_MAN_DIR)"
 173 
	$(Q)install -m 644 "$(BUNDLE_DIR)/man/openttd.6.gz" "$(INSTALL_MAN_DIR)/${BINARY_NAME}.6.gz"
167 
endif
 174 
endif
168 
ifdef MENU_DIR
 175 
ifdef MENU_DIR
169 
	$(Q)install -d "$(INSTALL_MENU_DIR)"
 176 
	$(Q)install -d "$(INSTALL_MENU_DIR)"
170 
	$(Q)install -m 644 "$(BUNDLE_DIR)/media/openttd.desktop" "$(INSTALL_MENU_DIR)"
 177 
	$(Q)install -m 644 "$(BUNDLE_DIR)/media/openttd.desktop" "$(INSTALL_MENU_DIR)/${BINARY_NAME}.desktop"
171 
endif
 178 
endif
172 
	$(Q)cp -R "$(BUNDLE_DIR)/scenario" "$(INSTALL_DATA_DIR)"
 179 
	$(Q)cp -R "$(BUNDLE_DIR)/scenario" "$(INSTALL_DATA_DIR)"
173 
endif # OSXAPP
 180 
endif # OSXAPP
(-)config.lib (+8 lines)
Lines 37-42 Link Here
37 
	man_dir="1"
 37 
	man_dir="1"
38 
	menu_dir="1"
 38 
	menu_dir="1"
39 
	menu_group="Game;"
 39 
	menu_group="Game;"
40 
	binary_name="openttd"
40 
	enable_debug="0"
 41 
	enable_debug="0"
41 
	enable_desync_debug="0"
 42 
	enable_desync_debug="0"
42 
	enable_profiling="0"
 43 
	enable_profiling="0"
Lines 100-105 Link Here
100 
		shared_dir
 101 
		shared_dir
101 
		install_dir
 102 
		install_dir
102 
		menu_group
 103 
		menu_group
104 
		binary_name
103 
		enable_debug
 105 
		enable_debug
104 
		enable_desync_debug
 106 
		enable_desync_debug
105 
		enable_profiling
 107 
		enable_profiling
Lines 213-218 Link Here
213 
			--menu-dir=*)                 menu_dir="$optarg";;
 215 
			--menu-dir=*)                 menu_dir="$optarg";;
214 
			--without-menu-entry)         menu_dir="";;
 216 
			--without-menu-entry)         menu_dir="";;
215 

          217
          

        

            

              
              
              218
              
			--binary-name)                prevp_p="binary_name";;

            

            

              219
              
			--binary-name=*)              binary_name="$optarg";;

            

            

              220
              

            

        

          216
          
			--man-dir)                    prevp_p="man_dir";;

          221
          
			--man-dir)                    prevp_p="man_dir";;

        

        

          217
          
			--man-dir=*)                  man_dir="$optarg";;

          222
          
			--man-dir=*)                  man_dir="$optarg";;

        

        

          218
          

          223
          

        

  

    
      
            Lines 2298-2303
          
      
      
        Link Here
      
    
  

        

          2298
          
		s#!!PERSONAL_DIR!!#$personal_dir#g;

          2303
          
		s#!!PERSONAL_DIR!!#$personal_dir#g;

        

        

          2299
          
		s#!!SHARED_DIR!!#$shared_dir#g;

          2304
          
		s#!!SHARED_DIR!!#$shared_dir#g;

        

        

          2300
          
		s#!!INSTALL_DIR!!#$install_dir#g;

          2305
          
		s#!!INSTALL_DIR!!#$install_dir#g;

        

            

              
              
              2306
              
		s#!!BINARY_NAME!!#$binary_name#g;

            

        

          2301
          
		s#!!STRGEN!!#$STRGEN#g;

          2307
          
		s#!!STRGEN!!#$STRGEN#g;

        

        

          2302
          
		s#!!ENDIAN_CHECK!!#$ENDIAN_CHECK#g;

          2308
          
		s#!!ENDIAN_CHECK!!#$ENDIAN_CHECK#g;

        

        

          2303
          
		s#!!ENDIAN_FORCE!!#$endian#g;

          2309
          
		s#!!ENDIAN_FORCE!!#$endian#g;

        

  

    
      
            Lines 2507-2512
          
      
      
        Link Here
      
    
  

        

          2507
          
	echo "                                 [$shared_dir]"

          2513
          
	echo "                                 [$shared_dir]"

        

        

          2508
          
	echo "  --install-dir=dir              specifies the root to install to."

          2514
          
	echo "  --install-dir=dir              specifies the root to install to."

        

        

          2509
          
	echo "                                 Useful to install into jails [$install_dir]"

          2515
          
	echo "                                 Useful to install into jails [$install_dir]"

        

            

              
              
              2516
              
	echo "  --binary-name                  the name used for the binary, icons,"

            

            

              2517
              
	echo "                                 desktop file, etc. when installing [openttd]"

            

        

          2510
          
	echo ""

          2518
          
	echo ""

        

        

          2511
          
	echo "Features and packages:"

          2519
          
	echo "Features and packages:"

        

        

          2512
          
	echo "  --enable-debug[=LVL]           enable debug-mode (LVL=[0123], 0 is release)"

          2520
          
	echo "  --enable-debug[=LVL]           enable debug-mode (LVL=[0123], 0 is release)"

        






  

  Return to bug 215776