Date: Fri, 18 Jan 2013 22:50:29 +0000 (UTC) From: Brooks Davis <brooks@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r245627 - projects/mtree/etc Message-ID: <201301182250.r0IMoTM2073559@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brooks Date: Fri Jan 18 22:50:29 2013 New Revision: 245627 URL: http://svnweb.freebsd.org/changeset/base/245627 Log: Centralize the removal of extra /'s in DESTDIR. Modified: projects/mtree/etc/Makefile Modified: projects/mtree/etc/Makefile ============================================================================== --- projects/mtree/etc/Makefile Fri Jan 18 22:36:09 2013 (r245626) +++ projects/mtree/etc/Makefile Fri Jan 18 22:50:29 2013 (r245627) @@ -156,6 +156,9 @@ ETCMAIL=Makefile README mailer.conf acce # Special top level files for FreeBSD FREEBSD=COPYRIGHT +# Sanitize DESTDIR +DESTDIR:= ${DESTDIR:C://*:/:g} + afterinstall: .if ${MK_MAN} != "no" ${_+_}cd ${.CURDIR}/../share/man; ${MAKE} makedb @@ -339,7 +342,7 @@ distrib-dirs: ${MTREE_CMD} -C -f $$m | sed s#^\.#.$$d# >> ${METALOG} ; \ done; true .endif - ${INSTALL_SYMLINK} usr/src/sys ${DESTDIR:S#//#/#}/sys + ${INSTALL_SYMLINK} usr/src/sys ${DESTDIR}/sys cd ${DESTDIR}/usr/share/man; \ for mandir in man*; do \ ${INSTALL_SYMLINK} ../$$mandir \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301182250.r0IMoTM2073559>