Attachment #318292 for bug #426838




realinstall:
.for _dev in ${PRINTERDEVICE:Mhtml}
	cd ${SRCDIR}; \
	    ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}; \
	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
	    ${DOC}*.html ${DESTDIR}${BINDIR}/${VOLUME}
.endfor
.for _dev in ${PRINTERDEVICE:Nhtml}
	${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}; \
	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
	    ${DFILE.${_dev}} ${DESTDIR}${BINDIR}/${VOLUME}
.endfor




.endif
installfiles: _${group}INS_${file:T}
_${group}INS_${file:T}: ${file}
	${INSTALL} -d ${DESTDIR}${${group}DIR_${.ALLSRC:T}}
	${INSTALL} -o ${${group}OWN_${.ALLSRC:T}} \
	    -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
	    ${.ALLSRC} \

installfiles: _${group}INS
_${group}INS: ${_${group}FILES}
.if defined(${group}NAME)
	${INSTALL} -d ${DESTDIR}${${group}DIR}/${${group}NAME}
	${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \
	    -m ${${group}MODE} ${.ALLSRC} \
	    ${DESTDIR}${${group}DIR}/${${group}NAME}
.else
	${INSTALL} -d ${DESTDIR}${${group}DIR}
	${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \
	    -m ${${group}MODE} ${.ALLSRC} ${DESTDIR}${${group}DIR}
.endif

Lines 41-46 Link Here

(-)share.orig/mk/bsd.incs.mk (+7 lines)
41	.endif	41	.endif
42	installincludes: _${group}INS_${header:T}	42	installincludes: _${group}INS_${header:T}
43	_${group}INS_${header:T}: ${header}	43	_${group}INS_${header:T}: ${header}
		44	${INSTALL} -d -o ${${group}OWN_${.ALLSRC:T}} \
		45	-g ${${group}GRP_${.ALLSRC:T}} \
		46	${DESTDIR}${${group}DIR_${.ALLSRC:T}}
44	${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \	47	${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \
45	-g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \	48	-g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
46	${.ALLSRC} \	49	${.ALLSRC} \
Lines 53-61 Link Here
53	installincludes: _${group}INS	56	installincludes: _${group}INS
54	_${group}INS: ${_${group}INCS}	57	_${group}INS: ${_${group}INCS}
55	.if defined(${group}NAME)	58	.if defined(${group}NAME)
		59	${INSTALL} -d -o ${${group}OWN} -g ${${group}GRP} \
		60	${DESTDIR}${${group}DIR}
56	${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \	61	${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
57	${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME}	62	${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME}
58	.else	63	.else
		64	${INSTALL} -d -o ${${group}OWN} -g ${${group}GRP} \
		65	${DESTDIR}${${group}DIR}
59	${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \	66	${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
60	${.ALLSRC} ${DESTDIR}${${group}DIR}	67	${.ALLSRC} ${DESTDIR}${${group}DIR}
61	.endif	68	.endif




TEX?=		tex
DVIPS?=		dvips
DVIPS2ASCII?=	dvips2ascii
INSTALL?=	install

.SUFFIXES: ${ICOMPRESS_EXT} .info .texi .texinfo .dvi .ps .latin1 .html


INSTALLINFODIRS+= ${x:S/$/-install/}
${x:S/$/-install/}:
.if !empty(.MAKEFLAGS:M-j)
	${INSTALL} -d ${DESTDIR}${INFODIR}
	lockf -k ${DESTDIR}${INFODIR}/${INFODIRFILE} \
	${INSTALLINFO} ${INSTALLINFOFLAGS} \
	    --section=${INFOSECTION} \
	    --entry=${INFOENTRY_${x}} \
	    ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE}
.else
	${INSTALL} -d ${DESTDIR}${INFODIR}
	${INSTALLINFO} ${INSTALLINFOFLAGS} \
	    --section=${INFOSECTION} \
	    --entry=${INFOENTRY_${x}} \
	    ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE}
.endif
.endfor




.endif
.endif

.if !defined(DEBUG_FLAGS)
STRIP?=	-s
.endif

.include <bsd.libnames.mk>

# prefer .s to a .c, add .po, remove stuff not used in the BSD libraries

.ORDER: beforeinstall _libinstall
_libinstall:
.if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no"
	${INSTALL} -d ${DESTDIR}${LIBDIR}
	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
	    ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR}
.endif
.if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB)
	${INSTALL} -d ${DESTDIR}${LIBDIR}
	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
	    ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${LIBDIR}
.endif
.if defined(SHLIB_NAME)
	${INSTALL} -d ${DESTDIR}${SHLIBDIR}
	${INSTALL} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
	    ${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \
	    ${SHLIB_NAME} ${DESTDIR}${SHLIBDIR}

.endif # SHLIB_LINK
.endif # SHIB_NAME
.if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && ${MK_TOOLCHAIN} != "no"
	${INSTALL} -d ${DESTDIR}${LIBDIR}
	${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
	    ${_INSTALLFLAGS} lib${LIB}_pic.a ${DESTDIR}${LIBDIR}
.endif
.if defined(WANT_LINT) && !defined(NO_LINT) && defined(LIB) && !empty(LIB)
	${INSTALL} -d ${DESTDIR}${LINTLIBDIR}
	${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
	    ${_INSTALLFLAGS} ${LINTLIB} ${DESTDIR}${LINTLIBDIR}
.endif

Lines 15-20 Link Here

(-)share.orig/mk/bsd.links.mk (+4 lines)
15	t=${DESTDIR}$$1; \	15	t=${DESTDIR}$$1; \
16	shift; \	16	shift; \
17	${ECHO} $$t -\> $$l; \	17	${ECHO} $$t -\> $$l; \
		18	d=`dirname $$t`; \
		19	test -d $$d \|\| mkdir $$d; \
18	ln -f $$l $$t; \	20	ln -f $$l $$t; \
19	done; true	21	done; true
20	.endif	22	.endif
Lines 26-31 Link Here
26	t=${DESTDIR}$$1; \	28	t=${DESTDIR}$$1; \
27	shift; \	29	shift; \
28	${ECHO} $$t -\> $$l; \	30	${ECHO} $$t -\> $$l; \
		31	d=`dirname $$t`; \
		32	test -d $$d \|\| mkdir $$d; \
29	ln -fs $$l $$t; \	33	ln -fs $$l $$t; \
30	done; true	34	done; true
31	.endif	35	.endif




.if defined(NO_MANCOMPRESS)
.if defined(MANFILTER)
.for __page in ${MAN}
	${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}/${page}
	${MINSTALL} ${__page:T:S/$/${FILTEXTENSION}/g} \
		${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}/${__page}
.if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
	${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page}
	${MINSTALL} ${__page:T:S/$/${CATEXT}${FILTEXTENSION}/g} \
		${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page}
.endif

		esac; \
		page=$$1; shift; sect=$$1; shift; \
		d=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}; \
		${ECHO} ${INSTALL} -d $${d}; \
		${INSTALL} -d $${d}; \
		${ECHO} ${MINSTALL} $${page} $${d}; \
		${MINSTALL} $${page} $${d}; \
	done
.if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
.for __page in ${MAN}
	${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T}
	${MINSTALL} ${__page:T:S/$/${CATEXT}/} \
		${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T}
.endfor

.endif
.else
.for __page in ${MAN}
	${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}
	${MINSTALL} ${__page:T:S/$/${MCOMPRESS_EXT}/g} \
		${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}
.if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
	${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T:S/$/${MCOMPRESS_EXT}
	${MINSTALL} ${__page:T:S/$/${CATEXT}${MCOMPRESS_EXT}/g} \
		${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T:S/$/${MCOMPRESS_EXT}/}
.endif

Lines 62-68 Link Here

(-)share.orig/mk/bsd.nls.mk (-1 / +2 lines)
62	# installation rules	62	# installation rules
63	#	63	#
64	.for file in ${NLS}	64	.for file in ${NLS}
65	NLSNAME_${file:T}= ${file:T:R}/${NLSNAME}.cat	65	NLSDIR_${file:T}= ${SHAREDIR}/nls/${file:T:R}/
		66	NLSNAME_${file:T}= ${NLSNAME}.cat
66	.if defined(NLSLINKS_${file:R}) && !empty(NLSLINKS_${file:R})	67	.if defined(NLSLINKS_${file:R}) && !empty(NLSLINKS_${file:R})
67	NLSLINKS+= ${file:R}	68	NLSLINKS+= ${file:R}
68	.endif	69	.endif

Lines 182-190 Link Here

(-)share.orig/mk/bsd.own.mk (-3 lines)
182	INCLUDEDIR?= /usr/include	182	INCLUDEDIR?= /usr/include
183		183
184	# Common variables	184	# Common variables
185	.if !defined(DEBUG_FLAGS)
186	STRIP?= -s
187	.endif
188		185
189	COMPRESS_CMD?= gzip -cn	186	COMPRESS_CMD?= gzip -cn
190	COMPRESS_EXT?= .gz	187	COMPRESS_EXT?= .gz




CFLAGS+=${CRUNCH_CFLAGS}
.endif

.if !defined(DEBUG_FLAGS)
STRIP?=	-s
.endif

.if defined(NO_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO")
LDFLAGS+= -static
.endif

.ORDER: beforeinstall _proginstall
_proginstall:
.if defined(PROG)
	${INSTALL} -d ${DESTDIR}${BINDIR}
.if defined(PROGNAME)
	${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
	    ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME}

SCRIPTSMODE_${script:T}?=	${SCRIPTSMODE}
_scriptsinstall: _SCRIPTSINS_${script:T}
_SCRIPTSINS_${script:T}: ${script}
	${INSTALL} -d ${DESTDIR}${SCRIPTSDIR_${.ALLSRC:T}}
	${INSTALL} -o ${SCRIPTSOWN_${.ALLSRC:T}} \
	    -g ${SCRIPTSGRP_${.ALLSRC:T}} -m ${SCRIPTSMODE_${.ALLSRC:T}} \
	    ${.ALLSRC} \




.if defined(WARNS)
.if ${WARNS} >= 1
CWARNFLAGS+=	-Wsystem-headers
.if !defined(NO_WERROR) && ((${MK_CLANG_IS_CC} == "no" && \
    ${CC:T:Mclang} != "clang") || !defined(NO_WERROR.clang))
CWARNFLAGS+=	-Werror
.endif # !NO_WERROR && (!CLANG || !NO_WERROR.clang)
.endif # WARNS >= 1
.if ${WARNS} >= 2
CWARNFLAGS+=	-Wall -Wno-format-y2k

CWARNFLAGS+=	-Wno-format-nonliteral
.endif # WARNS <= 3
.endif # CLANG
.if !defined(NO_WERROR) && ((${MK_CLANG_IS_CC} == "no" && \
    ${CC:T:Mclang} != "clang") || !defined(NO_WERROR.clang))
CWARNFLAGS+=	-Werror
.endif # !NO_WERROR && (!CLANG || !NO_WERROR.clang)
.endif # WFORMAT > 0
.endif # WFORMAT
.if defined(NO_WFORMAT) || ((${MK_CLANG_IS_CC} != "no" || \




		(${ECHO} ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} && \
		${CTFCONVERT} ${CTFFLAGS} ${.TARGET})

# FreeBSD build pollution.  Hide it in the non-POSIX part of the ifdef.
__MAKE_CONF?=/etc/make.conf
.if exists(${__MAKE_CONF})
.include "${__MAKE_CONF}"
.endif

.if defined(__MAKE_SHELL) && !empty(__MAKE_SHELL)
SHELL=	${__MAKE_SHELL}
.SHELL: path=${__MAKE_SHELL}

Return to bug 426838

Lines 135-144 Link Here

(-)share.orig/mk/bsd.doc.mk (+2 lines)
135	realinstall:	135	realinstall:
136	.for _dev in ${PRINTERDEVICE:Mhtml}	136	.for _dev in ${PRINTERDEVICE:Mhtml}
137	cd ${SRCDIR}; \	137	cd ${SRCDIR}; \
		138	${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}; \
138	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \	139	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
139	${DOC}*.html ${DESTDIR}${BINDIR}/${VOLUME}	140	${DOC}*.html ${DESTDIR}${BINDIR}/${VOLUME}
140	.endfor	141	.endfor
141	.for _dev in ${PRINTERDEVICE:Nhtml}	142	.for _dev in ${PRINTERDEVICE:Nhtml}
		143	${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}; \
142	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \	144	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
143	${DFILE.${_dev}} ${DESTDIR}${BINDIR}/${VOLUME}	145	${DFILE.${_dev}} ${DESTDIR}${BINDIR}/${VOLUME}
144	.endfor	146	.endfor

Lines 349-360 Link Here

(-)share.orig/mk/sys.mk (-6 lines)
349	(${ECHO} ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} && \	349	(${ECHO} ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} && \
350	${CTFCONVERT} ${CTFFLAGS} ${.TARGET})	350	${CTFCONVERT} ${CTFFLAGS} ${.TARGET})
351		351
352	# FreeBSD build pollution. Hide it in the non-POSIX part of the ifdef.
353	__MAKE_CONF?=/etc/make.conf
354	.if exists(${__MAKE_CONF})
355	.include "${__MAKE_CONF}"
356	.endif
357
358	.if defined(__MAKE_SHELL) && !empty(__MAKE_SHELL)	352	.if defined(__MAKE_SHELL) && !empty(__MAKE_SHELL)
359	SHELL= ${__MAKE_SHELL}	353	SHELL= ${__MAKE_SHELL}
360	.SHELL: path=${__MAKE_SHELL}	354	.SHELL: path=${__MAKE_SHELL}

Lines 39-44 Link Here

(-)share.orig/mk/bsd.files.mk (+3 lines)
39	.endif	39	.endif
40	installfiles: _${group}INS_${file:T}	40	installfiles: _${group}INS_${file:T}
41	_${group}INS_${file:T}: ${file}	41	_${group}INS_${file:T}: ${file}
		42	${INSTALL} -d ${DESTDIR}${${group}DIR_${.ALLSRC:T}}
42	${INSTALL} -o ${${group}OWN_${.ALLSRC:T}} \	43	${INSTALL} -o ${${group}OWN_${.ALLSRC:T}} \
43	-g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \	44	-g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
44	${.ALLSRC} \	45	${.ALLSRC} \
Lines 51-60 Link Here
51	installfiles: _${group}INS	52	installfiles: _${group}INS
52	_${group}INS: ${_${group}FILES}	53	_${group}INS: ${_${group}FILES}
53	.if defined(${group}NAME)	54	.if defined(${group}NAME)
		55	${INSTALL} -d ${DESTDIR}${${group}DIR}/${${group}NAME}
54	${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \	56	${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \
55	-m ${${group}MODE} ${.ALLSRC} \	57	-m ${${group}MODE} ${.ALLSRC} \
56	${DESTDIR}${${group}DIR}/${${group}NAME}	58	${DESTDIR}${${group}DIR}/${${group}NAME}
57	.else	59	.else
		60	${INSTALL} -d ${DESTDIR}${${group}DIR}
58	${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \	61	${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \
59	-m ${${group}MODE} ${.ALLSRC} ${DESTDIR}${${group}DIR}	62	-m ${${group}MODE} ${.ALLSRC} ${DESTDIR}${${group}DIR}
60	.endif	63	.endif

Lines 83-88 Link Here

(-)share.orig/mk/bsd.info.mk (-4 / +7 lines)
83	TEX?= tex	83	TEX?= tex
84	DVIPS?= dvips	84	DVIPS?= dvips
85	DVIPS2ASCII?= dvips2ascii	85	DVIPS2ASCII?= dvips2ascii
		86	INSTALL?= install
86		87
87	.SUFFIXES: ${ICOMPRESS_EXT} .info .texi .texinfo .dvi .ps .latin1 .html	88	.SUFFIXES: ${ICOMPRESS_EXT} .info .texi .texinfo .dvi .ps .latin1 .html
88		89
Lines 144-158 Link Here
144	INSTALLINFODIRS+= ${x:S/$/-install/}	145	INSTALLINFODIRS+= ${x:S/$/-install/}
145	${x:S/$/-install/}:	146	${x:S/$/-install/}:
146	.if !empty(.MAKEFLAGS:M-j)	147	.if !empty(.MAKEFLAGS:M-j)
		148	${INSTALL} -d ${DESTDIR}${INFODIR}
147	lockf -k ${DESTDIR}${INFODIR}/${INFODIRFILE} \	149	lockf -k ${DESTDIR}${INFODIR}/${INFODIRFILE} \
148	${INSTALLINFO} ${INSTALLINFOFLAGS} \	150	${INSTALLINFO} ${INSTALLINFOFLAGS} \
149	--defsection=${INFOSECTION} \	151	--section=${INFOSECTION} \
150	--defentry=${INFOENTRY_${x}} \	152	--entry=${INFOENTRY_${x}} \
151	${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE}	153	${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE}
152	.else	154	.else
		155	${INSTALL} -d ${DESTDIR}${INFODIR}
153	${INSTALLINFO} ${INSTALLINFOFLAGS} \	156	${INSTALLINFO} ${INSTALLINFOFLAGS} \
154	--defsection=${INFOSECTION} \	157	--section=${INFOSECTION} \
155	--defentry=${INFOENTRY_${x}} \	158	--entry=${INFOENTRY_${x}} \
156	${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE}	159	${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE}
157	.endif	160	.endif
158	.endfor	161	.endfor

Lines 46-55 Link Here

(-)share.orig/mk/bsd.lib.mk (-4 / +5 lines)
46	.endif	46	.endif
47	.endif	47	.endif
48		48
49	.if !defined(DEBUG_FLAGS)
50	STRIP?= -s
51	.endif
52
53	.include <bsd.libnames.mk>	49	.include <bsd.libnames.mk>
54		50
55	# prefer .s to a .c, add .po, remove stuff not used in the BSD libraries	51	# prefer .s to a .c, add .po, remove stuff not used in the BSD libraries
Lines 284-297 Link Here
284	.ORDER: beforeinstall _libinstall	280	.ORDER: beforeinstall _libinstall
285	_libinstall:	281	_libinstall:
286	.if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no"	282	.if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no"
		283	${INSTALL} -d ${DESTDIR}${LIBDIR}
287	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \	284	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
288	${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR}	285	${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR}
289	.endif	286	.endif
290	.if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB)	287	.if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB)
		288	${INSTALL} -d ${DESTDIR}${LIBDIR}
291	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \	289	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
292	${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${LIBDIR}	290	${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${LIBDIR}
293	.endif	291	.endif
294	.if defined(SHLIB_NAME)	292	.if defined(SHLIB_NAME)
		293	${INSTALL} -d ${DESTDIR}${SHLIBDIR}
295	${INSTALL} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \	294	${INSTALL} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
296	${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \	295	${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \
297	${SHLIB_NAME} ${DESTDIR}${SHLIBDIR}	296	${SHLIB_NAME} ${DESTDIR}${SHLIBDIR}
Lines 329-338 Link Here
329	.endif # SHLIB_LINK	328	.endif # SHLIB_LINK
330	.endif # SHIB_NAME	329	.endif # SHIB_NAME
331	.if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && ${MK_TOOLCHAIN} != "no"	330	.if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && ${MK_TOOLCHAIN} != "no"
		331	${INSTALL} -d ${DESTDIR}${LIBDIR}
332	${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \	332	${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
333	${_INSTALLFLAGS} lib${LIB}_pic.a ${DESTDIR}${LIBDIR}	333	${_INSTALLFLAGS} lib${LIB}_pic.a ${DESTDIR}${LIBDIR}
334	.endif	334	.endif
335	.if defined(WANT_LINT) && !defined(NO_LINT) && defined(LIB) && !empty(LIB)	335	.if defined(WANT_LINT) && !defined(NO_LINT) && defined(LIB) && !empty(LIB)
		336	${INSTALL} -d ${DESTDIR}${LINTLIBDIR}
336	${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \	337	${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
337	${_INSTALLFLAGS} ${LINTLIB} ${DESTDIR}${LINTLIBDIR}	338	${_INSTALLFLAGS} ${LINTLIB} ${DESTDIR}${LINTLIBDIR}
338	.endif	339	.endif

Lines 48-54 Link Here

(-)share.orig/mk/bsd.libnames.mk (-2 / +2 lines)
48	LIBEDIT?= ${DESTDIR}${LIBDIR}/libedit.a	48	LIBEDIT?= ${DESTDIR}${LIBDIR}/libedit.a
49	LIBELF?= ${DESTDIR}${LIBDIR}/libelf.a	49	LIBELF?= ${DESTDIR}${LIBDIR}/libelf.a
50	LIBFETCH?= ${DESTDIR}${LIBDIR}/libfetch.a	50	LIBFETCH?= ${DESTDIR}${LIBDIR}/libfetch.a
51	LIBFL?= "don't use LIBFL, use LIBL"	51	LIBFL?= ${DESTDIR}${LIBDIR}/libfl.a
52	LIBFORM?= ${DESTDIR}${LIBDIR}/libform.a	52	LIBFORM?= ${DESTDIR}${LIBDIR}/libform.a
53	LIBFTPIO?= ${DESTDIR}${LIBDIR}/libftpio.a	53	LIBFTPIO?= ${DESTDIR}${LIBDIR}/libftpio.a
54	LIBG2C?= ${DESTDIR}${LIBDIR}/libg2c.a	54	LIBG2C?= ${DESTDIR}${LIBDIR}/libg2c.a
Lines 79-85 Link Here
79	LIBKICONV?= ${DESTDIR}${LIBDIR}/libkiconv.a	79	LIBKICONV?= ${DESTDIR}${LIBDIR}/libkiconv.a
80	LIBKRB5?= ${DESTDIR}${LIBDIR}/libkrb5.a	80	LIBKRB5?= ${DESTDIR}${LIBDIR}/libkrb5.a
81	LIBKVM?= ${DESTDIR}${LIBDIR}/libkvm.a	81	LIBKVM?= ${DESTDIR}${LIBDIR}/libkvm.a
82	LIBL?= ${DESTDIR}${LIBDIR}/libl.a	82	LIBL?= ${DESTDIR}${LIBDIR}/libfl.a
83	LIBLN?= "don't use LIBLN, use LIBL"	83	LIBLN?= "don't use LIBLN, use LIBL"
84	.if ${MK_BIND} != "no"	84	.if ${MK_BIND} != "no"
85	LIBLWRES?= ${DESTDIR}${LIBDIR}/liblwres.a	85	LIBLWRES?= ${DESTDIR}${LIBDIR}/liblwres.a

Lines 165-173 Link Here

(-)share.orig/mk/bsd.man.mk (+7 lines)
165	.if defined(NO_MANCOMPRESS)	165	.if defined(NO_MANCOMPRESS)
166	.if defined(MANFILTER)	166	.if defined(MANFILTER)
167	.for __page in ${MAN}	167	.for __page in ${MAN}
		168	${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}/${page}
168	${MINSTALL} ${__page:T:S/$/${FILTEXTENSION}/g} \	169	${MINSTALL} ${__page:T:S/$/${FILTEXTENSION}/g} \
169	${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}/${__page}	170	${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}/${__page}
170	.if defined(MANBUILDCAT) && !empty(MANBUILDCAT)	171	.if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
		172	${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page}
171	${MINSTALL} ${__page:T:S/$/${CATEXT}${FILTEXTENSION}/g} \	173	${MINSTALL} ${__page:T:S/$/${CATEXT}${FILTEXTENSION}/g} \
172	${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page}	174	${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page}
173	.endif	175	.endif
Lines 181-191 Link Here
181	esac; \	183	esac; \
182	page=$$1; shift; sect=$$1; shift; \	184	page=$$1; shift; sect=$$1; shift; \
183	d=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}; \	185	d=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}; \
		186	${ECHO} ${INSTALL} -d $${d}; \
		187	${INSTALL} -d $${d}; \
184	${ECHO} ${MINSTALL} $${page} $${d}; \	188	${ECHO} ${MINSTALL} $${page} $${d}; \
185	${MINSTALL} $${page} $${d}; \	189	${MINSTALL} $${page} $${d}; \
186	done	190	done
187	.if defined(MANBUILDCAT) && !empty(MANBUILDCAT)	191	.if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
188	.for __page in ${MAN}	192	.for __page in ${MAN}
		193	${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T}
189	${MINSTALL} ${__page:T:S/$/${CATEXT}/} \	194	${MINSTALL} ${__page:T:S/$/${CATEXT}/} \
190	${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T}	195	${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T}
191	.endfor	196	.endfor
Lines 193-201 Link Here
193	.endif	198	.endif
194	.else	199	.else
195	.for __page in ${MAN}	200	.for __page in ${MAN}
		201	${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}
196	${MINSTALL} ${__page:T:S/$/${MCOMPRESS_EXT}/g} \	202	${MINSTALL} ${__page:T:S/$/${MCOMPRESS_EXT}/g} \
197	${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}	203	${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}
198	.if defined(MANBUILDCAT) && !empty(MANBUILDCAT)	204	.if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
		205	${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T:S/$/${MCOMPRESS_EXT}
199	${MINSTALL} ${__page:T:S/$/${CATEXT}${MCOMPRESS_EXT}/g} \	206	${MINSTALL} ${__page:T:S/$/${CATEXT}${MCOMPRESS_EXT}/g} \
200	${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T:S/$/${MCOMPRESS_EXT}/}	207	${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T:S/$/${MCOMPRESS_EXT}/}
201	.endif	208	.endif

Lines 33-42 Link Here

(-)share.orig/mk/bsd.prog.mk (-4 / +2 lines)
33	CFLAGS+=${CRUNCH_CFLAGS}	33	CFLAGS+=${CRUNCH_CFLAGS}
34	.endif	34	.endif
35		35
36	.if !defined(DEBUG_FLAGS)
37	STRIP?= -s
38	.endif
39
40	.if defined(NO_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO")	36	.if defined(NO_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO")
41	LDFLAGS+= -static	37	LDFLAGS+= -static
42	.endif	38	.endif
Lines 155-160 Link Here
155	.ORDER: beforeinstall _proginstall	151	.ORDER: beforeinstall _proginstall
156	_proginstall:	152	_proginstall:
157	.if defined(PROG)	153	.if defined(PROG)
		154	${INSTALL} -d ${DESTDIR}${BINDIR}
158	.if defined(PROGNAME)	155	.if defined(PROGNAME)
159	${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \	156	${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
160	${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME}	157	${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME}
Lines 186-191 Link Here
186	SCRIPTSMODE_${script:T}?= ${SCRIPTSMODE}	183	SCRIPTSMODE_${script:T}?= ${SCRIPTSMODE}
187	_scriptsinstall: _SCRIPTSINS_${script:T}	184	_scriptsinstall: _SCRIPTSINS_${script:T}
188	_SCRIPTSINS_${script:T}: ${script}	185	_SCRIPTSINS_${script:T}: ${script}
		186	${INSTALL} -d ${DESTDIR}${SCRIPTSDIR_${.ALLSRC:T}}
189	${INSTALL} -o ${SCRIPTSOWN_${.ALLSRC:T}} \	187	${INSTALL} -o ${SCRIPTSOWN_${.ALLSRC:T}} \
190	-g ${SCRIPTSGRP_${.ALLSRC:T}} -m ${SCRIPTSMODE_${.ALLSRC:T}} \	188	-g ${SCRIPTSGRP_${.ALLSRC:T}} -m ${SCRIPTSMODE_${.ALLSRC:T}} \
191	${.ALLSRC} \	189	${.ALLSRC} \

Lines 28-37 Link Here

(-)share.orig/mk/bsd.sys.mk (-8 lines)
28	.if defined(WARNS)	28	.if defined(WARNS)
29	.if ${WARNS} >= 1	29	.if ${WARNS} >= 1
30	CWARNFLAGS+= -Wsystem-headers	30	CWARNFLAGS+= -Wsystem-headers
31	.if !defined(NO_WERROR) && ((${MK_CLANG_IS_CC} == "no" && \
32	${CC:T:Mclang} != "clang") \|\| !defined(NO_WERROR.clang))
33	CWARNFLAGS+= -Werror
34	.endif # !NO_WERROR && (!CLANG \|\| !NO_WERROR.clang)
35	.endif # WARNS >= 1	31	.endif # WARNS >= 1
36	.if ${WARNS} >= 2	32	.if ${WARNS} >= 2
37	CWARNFLAGS+= -Wall -Wno-format-y2k	33	CWARNFLAGS+= -Wall -Wno-format-y2k
Lines 95-104 Link Here
95	CWARNFLAGS+= -Wno-format-nonliteral	91	CWARNFLAGS+= -Wno-format-nonliteral
96	.endif # WARNS <= 3	92	.endif # WARNS <= 3
97	.endif # CLANG	93	.endif # CLANG
98	.if !defined(NO_WERROR) && ((${MK_CLANG_IS_CC} == "no" && \
99	${CC:T:Mclang} != "clang") \|\| !defined(NO_WERROR.clang))
100	CWARNFLAGS+= -Werror
101	.endif # !NO_WERROR && (!CLANG \|\| !NO_WERROR.clang)
102	.endif # WFORMAT > 0	94	.endif # WFORMAT > 0
103	.endif # WFORMAT	95	.endif # WFORMAT
104	.if defined(NO_WFORMAT) \|\| ((${MK_CLANG_IS_CC} != "no" \|\| \	96	.if defined(NO_WFORMAT) \|\| ((${MK_CLANG_IS_CC} != "no" \|\| \