diff options
| author | manu <manu@pkgsrc.org> | 2020-04-29 13:56:10 +0000 |
|---|---|---|
| committer | manu <manu@pkgsrc.org> | 2020-04-29 13:56:10 +0000 |
| commit | 96480905e804fb605d50530c8c59eeead3b81da2 (patch) | |
| tree | 6026c3429912c7194445430219e4894200fa8ee8 /converters | |
| parent | abb3a0a324067476fef8a71a7508876bd9a7832b (diff) | |
| download | pkgsrc-96480905e804fb605d50530c8c59eeead3b81da2.tar.gz | |
Obtain system-dependant pkg_info full path
Diffstat (limited to 'converters')
| -rw-r--r-- | converters/unoconv/Makefile | 8 | ||||
| -rw-r--r-- | converters/unoconv/files/unoconv.sh | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/converters/unoconv/Makefile b/converters/unoconv/Makefile index f330b706ce8..28c49bfac1d 100644 --- a/converters/unoconv/Makefile +++ b/converters/unoconv/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.5 2020/04/28 15:18:44 manu Exp $ +# $NetBSD: Makefile,v 1.6 2020/04/29 13:56:10 manu Exp $ DISTNAME= unoconv-0.7 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= converters MASTER_SITES= ${MASTER_SITE_GITHUB:=dagwieers/} @@ -18,8 +18,8 @@ BUILD_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc DEPENDS+= libreoffice>=5.3.4.2nb1:../../misc/libreoffice pre-build: - sed "s|@PREFIX@|${PREFIX}|" ${FILESDIR}/unoconv.sh > \ - ${WRKDIR}/unoconv.sh + ${SED} -e "s|@PREFIX@|${PREFIX}|; s|@PKG_INFO_CMD@|${PKG_INFO_CMD}|;" \ + ${FILESDIR}/unoconv.sh > ${WRKDIR}/unoconv.sh do-install: ${INSTALL_PROGRAM_DIR} ${DESTDIR}/${PREFIX}/bin diff --git a/converters/unoconv/files/unoconv.sh b/converters/unoconv/files/unoconv.sh index b6b25de31d8..acfde7c61d4 100644 --- a/converters/unoconv/files/unoconv.sh +++ b/converters/unoconv/files/unoconv.sh @@ -1,7 +1,7 @@ #!/bin/sh -PYTHONBIN=`/usr/sbin/pkg_info -Q PYTHONBIN libreoffice` -UNO_PATH=`/usr/sbin/pkg_info -Q UNO_PATH libreoffice` +PYTHONBIN=`@PKG_INFO_CMD@ -Q PYTHONBIN libreoffice` +UNO_PATH=`@PKG_INFO_CMD@ -Q UNO_PATH libreoffice` LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${UNO_PATH} export UNO_PATH |