diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2014-10-08 06:13:43 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2014-10-08 06:13:43 +0000 |
| commit | fe0b735bba20d06ce14c2864a642a2849510d777 (patch) | |
| tree | 91347efbb1b5908efbb8e314a9c961f2cf920871 /Mk/bsd.port.mk | |
| parent | a8e8df12f46901d7a8d2354c66c97108d92cea24 (diff) | |
| download | ports-fe0b735bba20d06ce14c2864a642a2849510d777.tar.gz ports-fe0b735bba20d06ce14c2864a642a2849510d777.zip | |
Notes
Diffstat (limited to 'Mk/bsd.port.mk')
| -rw-r--r-- | Mk/bsd.port.mk | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 1c0ce676c991..27bdca05f56c 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -2821,12 +2821,6 @@ PLIST_SUB+= DOCSDIR="${DOCSDIR_REL}" \ ETCDIR="${ETCDIR_REL}" DESKTOPDIR?= ${PREFIX}/share/applications -_DESKTOPDIR_REL= ${DESKTOPDIR:S,^${PREFIX}/,,}/ - -.if ${_DESKTOPDIR_REL} == ${DESKTOPDIR}/ -# DESKTOPDIR is not beneath PREFIX -_DESKTOPDIR_REL= -.endif .MAIN: all @@ -5857,9 +5851,6 @@ check-desktop-entries: .if defined(DESKTOP_ENTRIES) install-desktop-entries: @set -- ${DESKTOP_ENTRIES} XXX; \ - if [ -z "${_DESKTOPDIR_REL}" ]; then \ - ${ECHO_CMD} "@cwd ${DESKTOPDIR}" >> ${TMPPLIST}; \ - fi; \ while [ $$# -gt 6 ]; do \ filename="`${ECHO_CMD} "$$4" | ${SED} -e 's,^/,,g;s,[/ ],_,g;s,[^_[:alnum:]],,g'`.desktop"; \ pathname="${STAGEDIR}${DESKTOPDIR}/$$filename"; \ @@ -5867,7 +5858,7 @@ install-desktop-entries: if [ -z "$$categories" ]; then \ categories="`cd ${.CURDIR} && ${MAKE} desktop-categories`"; \ fi; \ - ${ECHO_CMD} "${_DESKTOPDIR_REL}$$filename" >> ${TMPPLIST}; \ + ${ECHO_CMD} "${DESKTOPDIR}/$$filename" >> ${TMPPLIST}; \ ${ECHO_CMD} "[Desktop Entry]" > $$pathname; \ ${ECHO_CMD} "Type=Application" >> $$pathname; \ ${ECHO_CMD} "Version=1.0" >> $$pathname; \ @@ -5887,10 +5878,7 @@ install-desktop-entries: ${ECHO_CMD} "StartupNotify=$$6" >> $$pathname; \ fi; \ shift 6; \ - done; \ - if [ -z "${_DESKTOPDIR_REL}" ]; then \ - ${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}; \ - fi + done .endif .endif |