Use PKGNAME_NOREV to match the PLIST.

This commit is contained in:
joerg 2012-06-08 21:44:26 +00:00
parent 418524d3c5
commit 03af731224

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.2 2012/06/05 21:53:42 wiz Exp $ # $NetBSD: Makefile,v 1.3 2012/06/08 21:44:26 joerg Exp $
VER= 3.5.4.2 VER= 3.5.4.2
DISTNAME= libreoffice-${VER} DISTNAME= libreoffice-${VER}
@ -90,7 +90,7 @@ PTHREAD_OPTS+= require
HAS_CONFIGURE= yes HAS_CONFIGURE= yes
CHECK_PORTABILITY_SKIP= configure CHECK_PORTABILITY_SKIP= configure
CONFIGURE_ARGS+= --prefix=${DESTDIR}${PREFIX}/${PKGNAME} CONFIGURE_ARGS+= --prefix=${DESTDIR}${PREFIX}/${PKGNAME_NOREV}
CONFIGURE_ARGS+= --disable-ccache CONFIGURE_ARGS+= --disable-ccache
CONFIGURE_ARGS+= --disable-epm CONFIGURE_ARGS+= --disable-epm
CONFIGURE_ARGS+= --disable-ext-presenter-console CONFIGURE_ARGS+= --disable-ext-presenter-console
@ -167,11 +167,11 @@ post-configure:
AUTO_MKDIRS= yes AUTO_MKDIRS= yes
post-install: post-install:
for f in ${LO_PROGRAMS}; do \ for f in ${LO_PROGRAMS}; do \
${LN} -s ${DESTDIR}${PREFIX}/${PKGNAME}/program/$$f ${DESTDIR}${PREFIX}/bin/$$f; \ ${LN} -s ${DESTDIR}${PREFIX}/${PKGNAME_NOREV}/program/$$f ${DESTDIR}${PREFIX}/bin/$$f; \
done done
${LN} -s ${DESTDIR}${PREFIX}/${PKGNAME}/program/soffice ${DESTDIR}${PREFIX}/bin/libreoffice3.5 ${LN} -s ${DESTDIR}${PREFIX}/${PKGNAME_NOREV}/program/soffice ${DESTDIR}${PREFIX}/bin/libreoffice3.5
for f in ${LO_DESKTOP_FILES}; do \ for f in ${LO_DESKTOP_FILES}; do \
${LN} -s ${DESTDIR}${PREFIX}/${PKGNAME}/share/xdg/$$f ${DESTDIR}${PREFIX}/share/applications; \ ${LN} -s ${DESTDIR}${PREFIX}/${PKGNAME_NOREV}/share/xdg/$$f ${DESTDIR}${PREFIX}/share/applications; \
done done