diff options
| author | Marcus von Appen <mva@FreeBSD.org> | 2014-02-11 18:37:07 +0000 |
|---|---|---|
| committer | Marcus von Appen <mva@FreeBSD.org> | 2014-02-11 18:37:07 +0000 |
| commit | d839fbe3f9d546ee0524cbac07a4fdfdab18ae05 (patch) | |
| tree | a5e69f762a81ab588431327edc335935c76f07fb /Mk/Uses | |
| parent | b1412a3f4b9932bf2dd9924e6ea024736e2ca90b (diff) | |
| download | ports-d839fbe3f9d546ee0524cbac07a4fdfdab18ae05.tar.gz ports-d839fbe3f9d546ee0524cbac07a4fdfdab18ae05.zip | |
Notes
Diffstat (limited to 'Mk/Uses')
| -rw-r--r-- | Mk/Uses/uniquefiles.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Mk/Uses/uniquefiles.mk b/Mk/Uses/uniquefiles.mk index 0a9d038d4537..fba2f298437d 100644 --- a/Mk/Uses/uniquefiles.mk +++ b/Mk/Uses/uniquefiles.mk @@ -100,7 +100,7 @@ _UNIQUEPKGLIST= ${WRKDIR}/.PLIST.uniquefiles .if ${UNIQUE_DEFAULT_LINKS} == yes _DO_CONDITIONAL_SYMLINK= \ - if [ ! -e ${STAGEDIR}${PREFIX}/$${fname} ]; then \ + if [ ! -e ${STAGEDIR}${PREFIX}/$${fname} -a ! -L ${STAGEDIR}${PREFIX}/$${fname} ]; then \ ${ECHO_MSG} " $${newf} --> @$${fname}"; \ ${LN} -s ${PREFIX}/$${newf} ${STAGEDIR}${PREFIX}/$${fname}; \ ${ECHO_CMD} LINKED:$${newf}:$${fname} >> ${_UNIQUEPKGLIST}; \ @@ -116,7 +116,7 @@ move-uniquefiles: .endif .for entry in ${UNIQUE_PREFIX_FILES} @fname=${entry}; \ - if [ -e ${STAGEDIR}${PREFIX}/$${fname} ]; then \ + if [ -e ${STAGEDIR}${PREFIX}/$${fname} -o -L ${STAGEDIR}${PREFIX}/$${fname} ]; then \ newf=$${fname%/*}/${UNIQUE_PREFIX}$${fname##*/} ; \ ${ECHO_MSG} " $${fname} --> $${newf}" ; \ ${MV} ${STAGEDIR}${PREFIX}/$${fname} ${STAGEDIR}${PREFIX}/$${newf}; \ @@ -129,7 +129,7 @@ move-uniquefiles: .endfor .if ${UNIQUE_FIND_PREFIX_FILES} @for fname in `${UNIQUE_FIND_PREFIX_FILES}`; do \ - if [ -e ${STAGEDIR}${PREFIX}/$${fname} ]; then \ + if [ -e ${STAGEDIR}${PREFIX}/$${fname} -o -L ${STAGEDIR}${PREFIX}/$${fname} ]; then \ newf=$${fname%/*}/${UNIQUE_PREFIX}$${fname##*/} ; \ ${ECHO_MSG} " $${fname} --> $${newf}" ; \ ${MV} ${STAGEDIR}${PREFIX}/$${fname} ${STAGEDIR}${PREFIX}/$${newf}; \ @@ -147,7 +147,7 @@ move-uniquefiles: .endif .for entry in ${UNIQUE_SUFFIX_FILES} @fname=${entry}; \ - if [ -e ${STAGEDIR}${PREFIX}/$${fname} ]; then \ + if [ -e ${STAGEDIR}${PREFIX}/$${fname} -o -L ${STAGEDIR}${PREFIX}/$${fname} ]; then \ newf=$${fname%/*}/$${fname##*/}${UNIQUE_SUFFIX}; \ ${ECHO_MSG} " $${fname} --> $${newf}"; \ ${MV} ${STAGEDIR}${PREFIX}/$${fname} ${STAGEDIR}${PREFIX}/$${newf}; \ @@ -160,7 +160,7 @@ move-uniquefiles: .endfor .if ${UNIQUE_FIND_SUFFIX_FILES} @for fname in `${UNIQUE_FIND_SUFFIX_FILES}`; do \ - if [ -e ${STAGEDIR}${PREFIX}/$${fname} ]; then \ + if [ -e ${STAGEDIR}${PREFIX}/$${fname} -o -L ${STAGEDIR}${PREFIX}/$${fname} ]; then \ newf=$${fname%/*}/$${fname##*/}${UNIQUE_SUFFIX}; \ ${ECHO_MSG} " $${fname} --> $${newf}"; \ ${MV} ${STAGEDIR}${PREFIX}/$${fname} ${STAGEDIR}${PREFIX}/$${newf}; \ |