From owner-svn-src-projects@FreeBSD.ORG Wed Jan 9 02:56:31 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id B660B5C0; Wed, 9 Jan 2013 02:56:31 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id A9EC4C14; Wed, 9 Jan 2013 02:56:31 +0000 (UTC) Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r092uVPS005445; Wed, 9 Jan 2013 02:56:31 GMT (envelope-from brooks@svn.freebsd.org) Received: (from brooks@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r092uUGh005439; Wed, 9 Jan 2013 02:56:30 GMT (envelope-from brooks@svn.freebsd.org) Message-Id: <201301090256.r092uUGh005439@svn.freebsd.org> From: Brooks Davis Date: Wed, 9 Jan 2013 02:56:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r245208 - projects/mtree/share/mk X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Jan 2013 02:56:31 -0000 Author: brooks Date: Wed Jan 9 02:56:30 2013 New Revision: 245208 URL: http://svnweb.freebsd.org/changeset/base/245208 Log: Use install -l [sh] to create symbolic and hard links. This will allow metadata to be emitted when performing a non-root install. Modified: projects/mtree/share/mk/bsd.incs.mk projects/mtree/share/mk/bsd.info.mk projects/mtree/share/mk/bsd.lib.mk projects/mtree/share/mk/bsd.links.mk projects/mtree/share/mk/bsd.man.mk projects/mtree/share/mk/bsd.own.mk Modified: projects/mtree/share/mk/bsd.incs.mk ============================================================================== --- projects/mtree/share/mk/bsd.incs.mk Wed Jan 9 02:55:05 2013 (r245207) +++ projects/mtree/share/mk/bsd.incs.mk Wed Jan 9 02:56:30 2013 (r245208) @@ -73,7 +73,7 @@ installincludes: t=${DESTDIR}$$1; \ shift; \ ${ECHO} $$t -\> $$l; \ - ln -fs $$l $$t; \ + ${INSTALL_SYMLINK} $$l $$t; \ done; true .endif .endif # !target(installincludes) Modified: projects/mtree/share/mk/bsd.info.mk ============================================================================== --- projects/mtree/share/mk/bsd.info.mk Wed Jan 9 02:55:05 2013 (r245207) +++ projects/mtree/share/mk/bsd.info.mk Wed Jan 9 02:56:30 2013 (r245208) @@ -113,7 +113,7 @@ DVIPS2ASCII?= dvips2ascii .info.html: ${INFO2HTML} ${.IMPSRC} - ln -f ${.TARGET:R}.info.Top.html ${.TARGET} + ${INSTALL_LINK} ${.TARGET:R}.info.Top.html ${.TARGET} .PATH: ${.CURDIR} ${SRCDIR} Modified: projects/mtree/share/mk/bsd.lib.mk ============================================================================== --- projects/mtree/share/mk/bsd.lib.mk Wed Jan 9 02:55:05 2013 (r245207) +++ projects/mtree/share/mk/bsd.lib.mk Wed Jan 9 02:56:30 2013 (r245208) @@ -181,7 +181,7 @@ ${SHLIB_NAME}: ${SOBJS} @${ECHO} building shared library ${SHLIB_NAME} @rm -f ${SHLIB_NAME} ${SHLIB_LINK} .if defined(SHLIB_LINK) - @ln -fs ${SHLIB_NAME} ${SHLIB_LINK} + @${INSTALL_SYMLINK} ${SHLIB_NAME} ${SHLIB_LINK} .endif .if !defined(NM) @${CC} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \ @@ -306,9 +306,9 @@ _libinstall: ${_INSTALLFLAGS} lib${LIB}.ld ${DESTDIR}${LIBDIR}/${SHLIB_LINK} .else .if ${SHLIBDIR} == ${LIBDIR} - ln -fs ${SHLIB_NAME} ${DESTDIR}${LIBDIR}/${SHLIB_LINK} + ${INSTALL_SYMLINK} ${SHLIB_NAME} ${DESTDIR}${LIBDIR}/${SHLIB_LINK} .else - ln -fs ${_SHLIBDIRPREFIX}${SHLIBDIR}/${SHLIB_NAME} \ + ${INSTALL_SYMLINK} ${_SHLIBDIRPREFIX}${SHLIBDIR}/${SHLIB_NAME} \ ${DESTDIR}${LIBDIR}/${SHLIB_LINK} .if exists(${DESTDIR}${LIBDIR}/${SHLIB_NAME}) -chflags noschg ${DESTDIR}${LIBDIR}/${SHLIB_NAME} Modified: projects/mtree/share/mk/bsd.links.mk ============================================================================== --- projects/mtree/share/mk/bsd.links.mk Wed Jan 9 02:55:05 2013 (r245207) +++ projects/mtree/share/mk/bsd.links.mk Wed Jan 9 02:56:30 2013 (r245208) @@ -15,7 +15,7 @@ _installlinks: t=${DESTDIR}$$1; \ shift; \ ${ECHO} $$t -\> $$l; \ - ln -f $$l $$t; \ + ${INSTALL_LINK} $$l $$t; \ done; true .endif .if defined(SYMLINKS) && !empty(SYMLINKS) @@ -26,6 +26,6 @@ _installlinks: t=${DESTDIR}$$1; \ shift; \ ${ECHO} $$t -\> $$l; \ - ln -fs $$l $$t; \ + ${INSTALL_SYMLINK} $$l $$t; \ done; true .endif Modified: projects/mtree/share/mk/bsd.man.mk ============================================================================== --- projects/mtree/share/mk/bsd.man.mk Wed Jan 9 02:55:05 2013 (r245207) +++ projects/mtree/share/mk/bsd.man.mk Wed Jan 9 02:56:30 2013 (r245208) @@ -216,7 +216,7 @@ _maninstall: ${MAN} t=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}/$$name; \ ${ECHO} $${t}${ZEXT} -\> $${l}${ZEXT}; \ rm -f $${t} $${t}${MCOMPRESS_EXT}; \ - ln $${l}${ZEXT} $${t}${ZEXT}; \ + ${INSTALL_LINK} $${l}${ZEXT} $${t}${ZEXT}; \ done .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) @set ${MLINKS:C/\.([^.]*)$/.\1 \1/}; \ @@ -231,7 +231,7 @@ _maninstall: ${MAN} t=${DESTDIR}${CATDIR}$${sect}${MANSUBDIR}/$$name; \ ${ECHO} $${t}${ZEXT} -\> $${l}${ZEXT}; \ rm -f $${t} $${t}${MCOMPRESS_EXT}; \ - ln $${l}${ZEXT} $${t}${ZEXT}; \ + ${INSTALL_LINK} $${l}${ZEXT} $${t}${ZEXT}; \ done .endif .endif Modified: projects/mtree/share/mk/bsd.own.mk ============================================================================== --- projects/mtree/share/mk/bsd.own.mk Wed Jan 9 02:55:05 2013 (r245207) +++ projects/mtree/share/mk/bsd.own.mk Wed Jan 9 02:56:30 2013 (r245208) @@ -181,6 +181,15 @@ NLSMODE?= ${NOBINMODE} INCLUDEDIR?= /usr/include +# +# install(1) parameters. +# +HRDLINK?= -l h +SYMLINK?= -l s + +INSTALL_LINK?= ${INSTALL} ${HRDLINK} +INSTALL_SYMLINK?= ${INSTALL} ${SYMLINK} + # Common variables .if !defined(DEBUG_FLAGS) STRIP?= -s