--- src/share/mk/bsd.incs.mk | 6 +++--- src/share/mk/bsd.info.mk | 16 +++------------- src/share/mk/bsd.lib.mk | 18 +++++++++--------- src/share/mk/bsd.man.mk | 8 ++++---- src/share/mk/bsd.own.mk | 8 ++++---- src/share/mk/sys.mk | 3 +-- 6 files changed, 24 insertions(+), 35 deletions(-) Index: freebsd-buildutils/src/share/mk/bsd.incs.mk =================================================================== --- freebsd-buildutils.orig/src/share/mk/bsd.incs.mk +++ freebsd-buildutils/src/share/mk/bsd.incs.mk @@ -41,7 +41,7 @@ ${group}NAME_${header:T}?= ${header:T} .endif installincludes: _${group}INS_${header:T} _${group}INS_${header:T}: ${header} - ${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \ + ${INSTALL} -o ${${group}OWN_${.ALLSRC:T}} \ -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ ${.ALLSRC} \ ${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}} @@ -53,10 +53,10 @@ _${group}INCS+= ${header} installincludes: _${group}INS _${group}INS: ${_${group}INCS} .if defined(${group}NAME) - ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ + ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ ${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME} .else - ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ + ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ ${.ALLSRC} ${DESTDIR}${${group}DIR} .endif .endif Index: freebsd-buildutils/src/share/mk/bsd.info.mk =================================================================== --- freebsd-buildutils.orig/src/share/mk/bsd.info.mk +++ freebsd-buildutils/src/share/mk/bsd.info.mk @@ -73,7 +73,7 @@ MAKEINFO?= makeinfo MAKEINFOFLAGS+= --no-split # simplify some things, e.g., compression SRCDIR?= ${.CURDIR} INFODIRFILE?= dir -INSTALLINFO?= install-info +INSTALLINFO?= `which ginstall-info || which install-info` INSTALLINFOFLAGS+=--quiet INFOSECTION?= Miscellaneous ICOMPRESS_CMD?= ${COMPRESS_CMD} @@ -143,18 +143,8 @@ ${x:S/$/${ICOMPRESS_EXT}/}: ${x} .for x in ${INFO} INSTALLINFODIRS+= ${x:S/$/-install/} ${x:S/$/-install/}: -.if !empty(.MAKEFLAGS:M-j) - lockf -k ${DESTDIR}${INFODIR}/${INFODIRFILE} \ - ${INSTALLINFO} ${INSTALLINFOFLAGS} \ - --defsection=${INFOSECTION} \ - --defentry=${INFOENTRY_${x}} \ - ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE} -.else - ${INSTALLINFO} ${INSTALLINFOFLAGS} \ - --defsection=${INFOSECTION} \ - --defentry=${INFOENTRY_${x}} \ - ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE} -.endif + mkdir -p ${DESTDIR}${INFODIR} + install -m 644 ${x}.info ${DESTDIR}${INFODIR}/ .endfor .PHONY: ${INSTALLINFODIRS} Index: freebsd-buildutils/src/share/mk/bsd.lib.mk =================================================================== --- freebsd-buildutils.orig/src/share/mk/bsd.lib.mk +++ freebsd-buildutils/src/share/mk/bsd.lib.mk @@ -175,7 +175,7 @@ _LIBS= lib${LIB}.a lib${LIB}.a: ${OBJS} ${STATICOBJS} @${ECHO} building static ${LIB} library @rm -f ${.TARGET} - @${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD} + @${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort` ${ARADD} ${RANLIB} ${RANLIBFLAGS} ${.TARGET} .endif @@ -188,7 +188,7 @@ POBJS+= ${OBJS:.o=.po} ${STATICOBJS:.o= lib${LIB}_p.a: ${POBJS} @${ECHO} building profiled ${LIB} library @rm -f ${.TARGET} - @${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort -q` ${ARADD} + @${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort` ${ARADD} ${RANLIB} ${RANLIBFLAGS} ${.TARGET} .endif @@ -217,7 +217,7 @@ ${SHLIB_NAME_FULL}: ${SOBJS} .endif ${_LD} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \ -o ${.TARGET} -Wl,-soname,${SONAME} \ - `NM='${NM}' lorder ${SOBJS} | tsort -q` ${LDADD} + `NM='${NM}' lorder ${SOBJS} | tsort` ${LDADD} .if ${MK_CTF} != "no" ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS} .endif @@ -296,11 +296,11 @@ realinstall: _libinstall .ORDER: beforeinstall _libinstall _libinstall: .if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no" - ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ + ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${_LIBDIR} .endif .if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB) - ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ + ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${_LIBDIR} .endif .if defined(SHLIB_NAME) @@ -337,7 +337,7 @@ _libinstall: sed -e 's,@@SHLIB@@,${_LDSCRIPTROOT}${_SHLIBDIR}/${SHLIB_NAME},g' \ -e 's,@@LIBDIR@@,${_LDSCRIPTROOT}${_LIBDIR},g' \ ${.CURDIR}/${SHLIB_LDSCRIPT} > ${DESTDIR}${_LIBDIR}/${SHLIB_LINK:R}.ld - ${INSTALL} -S -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ + ${INSTALL} -S -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${_INSTALLFLAGS} ${DESTDIR}${_LIBDIR}/${SHLIB_LINK:R}.ld \ ${DESTDIR}${_LIBDIR}/${SHLIB_LINK} rm -f ${DESTDIR}${_LIBDIR}/${SHLIB_LINK:R}.ld Index: freebsd-buildutils/src/share/mk/bsd.own.mk =================================================================== --- freebsd-buildutils.orig/src/share/mk/bsd.own.mk +++ freebsd-buildutils/src/share/mk/bsd.own.mk @@ -18,7 +18,7 @@ # # BINOWN Binary owner. [root] # -# BINGRP Binary group. [wheel] +# BINGRP Binary group. [root] # # BINMODE Binary mode. [555] # @@ -65,7 +65,7 @@ # # SHAREOWN ASCII text file owner. [root] # -# SHAREGRP ASCII text file group. [wheel] +# SHAREGRP ASCII text file group. [root] # # SHAREMODE ASCII text file mode. [${NOBINMODE}] # @@ -131,7 +131,7 @@ SRCCONF?= /etc/src.conf # Binaries BINOWN?= root -BINGRP?= wheel +BINGRP?= root BINMODE?= 555 NOBINMODE?= 444 @@ -151,9 +151,9 @@ DTBMODE?= 444 LIBDIR?= /usr/lib LIBCOMPATDIR?= /usr/lib/compat LIBPRIVATEDIR?= /usr/lib/private -LIBDATADIR?= /usr/libdata -LIBEXECDIR?= /usr/libexec -LINTLIBDIR?= /usr/libdata/lint +LIBDATADIR?= /usr/share +LIBEXECDIR?= ${LIBDIR} +LINTLIBDIR?= ${LIBDATADIR}/lint SHLIBDIR?= ${LIBDIR} LIBOWN?= ${BINOWN} LIBGRP?= ${BINGRP} @@ -166,7 +166,7 @@ DEBUGMODE?= ${NOBINMODE} # Share files SHAREDIR?= /usr/share SHAREOWN?= root -SHAREGRP?= wheel +SHAREGRP?= root SHAREMODE?= ${NOBINMODE} CONFDIR?= /etc @@ -202,8 +202,8 @@ INCLUDEDIR?= /usr/include HRDLINK?= -l h SYMLINK?= -l s -INSTALL_LINK?= ${INSTALL} ${HRDLINK} -INSTALL_SYMLINK?= ${INSTALL} ${SYMLINK} +INSTALL_LINK?= ln +INSTALL_SYMLINK?= ln -s # Common variables .if !defined(DEBUG_FLAGS) Index: freebsd-buildutils/src/share/mk/sys.mk =================================================================== --- freebsd-buildutils.orig/src/share/mk/sys.mk +++ freebsd-buildutils/src/share/mk/sys.mk @@ -1,8 +1,7 @@ # from: @(#)sys.mk 8.2 (Berkeley) 3/21/94 # $FreeBSD$ -unix ?= We run FreeBSD, not UNIX. -.FreeBSD ?= true +unix ?= We run Debian, not UNIX. .if !defined(%POSIX) # Index: freebsd-buildutils/src/share/mk/bsd.compiler.mk =================================================================== --- freebsd-buildutils.orig/src/share/mk/bsd.compiler.mk +++ freebsd-buildutils/src/share/mk/bsd.compiler.mk @@ -36,7 +36,8 @@ COMPILER_TYPE:= gcc . elif ${_v:Mclang} COMPILER_TYPE:= clang . else -.error Unable to determine compiler type for ${CC}. Consider setting COMPILER_TYPE. +# Fallback to gcc in order to support CC="cc" case +COMPILER_TYPE:= gcc . endif .endif .if !defined(COMPILER_VERSION)