diff options
author | rillig <rillig@pkgsrc.org> | 2019-05-23 19:22:54 +0000 |
---|---|---|
committer | rillig <rillig@pkgsrc.org> | 2019-05-23 19:22:54 +0000 |
commit | cabadf3d995dfdb93e43fa33e676fdfbb6f7d1f5 (patch) | |
tree | dfd45506cac9c8adb60a55d809ab0dbc4d5a750e /pkgtools/pkg_alternatives | |
parent | afe0216c35d9e0e0b96fe80eb38badf368ef84a7 (diff) | |
download | pkgsrc-cabadf3d995dfdb93e43fa33e676fdfbb6f7d1f5.tar.gz |
all: replace SUBST_SED with the simpler SUBST_VARS
pkglint -Wall -r --only "substitution command" -F
With manual review and indentation fixes since pkglint doesn't get that
part correct in every case.
Diffstat (limited to 'pkgtools/pkg_alternatives')
-rw-r--r-- | pkgtools/pkg_alternatives/Makefile | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pkgtools/pkg_alternatives/Makefile b/pkgtools/pkg_alternatives/Makefile index a46dc65d41c..ecd61124a84 100644 --- a/pkgtools/pkg_alternatives/Makefile +++ b/pkgtools/pkg_alternatives/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2014/10/09 14:06:49 wiz Exp $ +# $NetBSD: Makefile,v 1.23 2019/05/23 19:23:12 rillig Exp $ # PKGNAME= pkg_alternatives-1.6 @@ -28,14 +28,14 @@ SUBST_STAGE.vars= do-configure SUBST_MESSAGE.vars= Configuring sources. SUBST_FILES.vars= pkg_alternatives.8 pkg_alternatives.sh SUBST_SED.vars= -e 's|@CONFDIR@|${PKG_SYSCONFDIR}|g' -SUBST_SED.vars+= -e 's|@DATADIR@|${DATADIR}|g' -SUBST_SED.vars+= -e 's|@DBDIR@|${DBDIR}|g' -SUBST_SED.vars+= -e 's|@PKGMANDIR@|${PKGMANDIR}|g' -SUBST_SED.vars+= -e 's|@PKG_DBDIR@|${PKG_DBDIR}|g' -SUBST_SED.vars+= -e 's|@PREFIX@|${PREFIX}|g' +SUBST_VARS.vars= DATADIR +SUBST_VARS.vars+= DBDIR +SUBST_VARS.vars+= PKGMANDIR +SUBST_VARS.vars+= PKG_DBDIR +SUBST_VARS.vars+= PREFIX SUBST_SED.vars+= -e 's|@ROOT_USER@|${REAL_ROOT_USER}|g' -SUBST_SED.vars+= -e 's|@ID@|${ID}|g' -SUBST_SED.vars+= -e 's|@SH@|${SH}|g' +SUBST_VARS.vars+= ID +SUBST_VARS.vars+= SH INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbin |