Project

General

Profile

Bug #5598 ยป p-mantype.diff

patch common.mk to always pass --mantype="$(MANTYPE)" - kernigh (George Koehler), 11/24/2011 07:29 AM

View differences:

common.mk (working copy)
123 123
INSTRUBY_ARGS =	$(SCRIPT_ARGS) \
124 124
		--data-mode=$(INSTALL_DATA_MODE) \
125 125
		--prog-mode=$(INSTALL_PROG_MODE) \
126
		--installed-list $(INSTALLED_LIST)
126
		--installed-list $(INSTALLED_LIST) \
127
		--mantype="$(MANTYPE)"
127 128
INSTALL_PROG_MODE = 0755
128 129
INSTALL_DATA_MODE = 0644
129 130

  
......
239 240
install-nodoc: pre-install-nodoc do-install-nodoc post-install-nodoc
240 241
pre-install-nodoc:: pre-install-local pre-install-ext
241 242
do-install-nodoc: $(PREP)
242
	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --mantype="$(MANTYPE)"
243
	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS)
243 244
post-install-nodoc:: post-install-local post-install-ext
244 245

  
245 246
install-local: pre-install-local do-install-local post-install-local
246 247
pre-install-local:: pre-install-bin pre-install-lib pre-install-man
247 248
do-install-local: $(PREP)
248
	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=local --mantype="$(MANTYPE)"
249
	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=local
249 250
post-install-local:: post-install-bin post-install-lib post-install-man
250 251

  
251 252
install-ext: pre-install-ext do-install-ext post-install-ext
......
297 298
install-man: pre-install-man do-install-man post-install-man
298 299
pre-install-man:: install-prereq
299 300
do-install-man: $(PREP)
300
	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=man --mantype="$(MANTYPE)"
301
	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=man
301 302
post-install-man::
302 303
	@$(NULLCMD)
303 304

  
......
322 323
no-install-nodoc: pre-no-install-nodoc dont-install-nodoc post-no-install-nodoc
323 324
pre-no-install-nodoc:: pre-no-install-local pre-no-install-ext
324 325
dont-install-nodoc:  $(PREP)
325
	$(INSTRUBY) -n --make="$(MAKE)" $(INSTRUBY_ARGS) --mantype="$(MANTYPE)"
326
	$(INSTRUBY) -n --make="$(MAKE)" $(INSTRUBY_ARGS)
326 327
post-no-install-nodoc:: post-no-install-local post-no-install-ext
327 328

  
328 329
what-where-local: no-install-local
329 330
no-install-local: pre-no-install-local dont-install-local post-no-install-local
330 331
pre-no-install-local:: pre-no-install-bin pre-no-install-lib pre-no-install-man
331 332
dont-install-local: $(PREP)
332
	$(INSTRUBY) -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=local --mantype="$(MANTYPE)"
333
	$(INSTRUBY) -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=local
333 334
post-no-install-local:: post-no-install-bin post-no-install-lib post-no-install-man
334 335

  
335 336
what-where-ext: no-install-ext
......
389 390
no-install-man: pre-no-install-man dont-install-man post-no-install-man
390 391
pre-no-install-man:: install-prereq
391 392
dont-install-man: $(PREP)
392
	$(INSTRUBY) -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=man --mantype="$(MANTYPE)"
393
	$(INSTRUBY) -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=man
393 394
post-no-install-man::
394 395
	@$(NULLCMD)
395 396