diff options
| author | rillig <rillig> | 2005-12-05 22:07:07 +0000 |
|---|---|---|
| committer | rillig <rillig> | 2005-12-05 22:07:07 +0000 |
| commit | 4569f8923c41fd063804cae5ced3a3099a082f83 (patch) | |
| tree | a408d210ca70e7629a1164ecf102e8adff03b5c4 /mk/install | |
| parent | 2a8cec031fe7c734a11578ef1dd1c476229a0ecf (diff) | |
| download | pkgsrc-4569f8923c41fd063804cae5ced3a3099a082f83.tar.gz | |
Applied all quoting fixes found by "pkglint --autofix".
Diffstat (limited to 'mk/install')
| -rw-r--r-- | mk/install/bsd.pkginstall.mk | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/mk/install/bsd.pkginstall.mk b/mk/install/bsd.pkginstall.mk index c479f796077..0a43ebeded2 100644 --- a/mk/install/bsd.pkginstall.mk +++ b/mk/install/bsd.pkginstall.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkginstall.mk,v 1.29 2005/10/28 20:09:38 joerg Exp $ +# $NetBSD: bsd.pkginstall.mk,v 1.30 2005/12/05 22:07:07 rillig Exp $ # # This Makefile fragment is included by bsd.pkg.mk to use the common # INSTALL/DEINSTALL scripts. To use this Makefile fragment, simply: @@ -80,18 +80,18 @@ INSTALL_SRC?= ${INSTALL_TEMPLATES} # FILES_SUBST lists what to substitute in DEINSTALL/INSTALL scripts and in # rc.d scripts. # -FILES_SUBST+= PREFIX=${PREFIX} -FILES_SUBST+= LOCALBASE=${LOCALBASE} -FILES_SUBST+= X11BASE=${X11BASE} -FILES_SUBST+= DEPOTBASE=${DEPOTBASE} -FILES_SUBST+= VARBASE=${VARBASE} -FILES_SUBST+= PKG_SYSCONFBASE=${PKG_SYSCONFBASE} -FILES_SUBST+= PKG_SYSCONFDEPOTBASE=${PKG_SYSCONFDEPOTBASE} -FILES_SUBST+= PKG_SYSCONFBASEDIR=${PKG_SYSCONFBASEDIR} -FILES_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR} +FILES_SUBST+= PREFIX=${PREFIX:Q} +FILES_SUBST+= LOCALBASE=${LOCALBASE:Q} +FILES_SUBST+= X11BASE=${X11BASE:Q} +FILES_SUBST+= DEPOTBASE=${DEPOTBASE:Q} +FILES_SUBST+= VARBASE=${VARBASE:Q} +FILES_SUBST+= PKG_SYSCONFBASE=${PKG_SYSCONFBASE:Q} +FILES_SUBST+= PKG_SYSCONFDEPOTBASE=${PKG_SYSCONFDEPOTBASE:Q} +FILES_SUBST+= PKG_SYSCONFBASEDIR=${PKG_SYSCONFBASEDIR:Q} +FILES_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q} FILES_SUBST+= CONF_DEPENDS=${CONF_DEPENDS:C/:.*//:Q} -FILES_SUBST+= PKGBASE=${PKGBASE} -FILES_SUBST+= PKG_INSTALLATION_TYPE=${PKG_INSTALLATION_TYPE} +FILES_SUBST+= PKGBASE=${PKGBASE:Q} +FILES_SUBST+= PKG_INSTALLATION_TYPE=${PKG_INSTALLATION_TYPE:Q} # PKG_USERS represents the users to create for the package. It is a # space-separated list of elements of the form @@ -116,8 +116,8 @@ PKG_GROUPS?= # empty PKG_USERS?= # empty _PKG_USER_HOME?= /nonexistent _PKG_USER_SHELL?= ${NOLOGIN} -FILES_SUBST+= PKG_USER_HOME=${_PKG_USER_HOME} -FILES_SUBST+= PKG_USER_SHELL=${_PKG_USER_SHELL} +FILES_SUBST+= PKG_USER_HOME=${_PKG_USER_HOME:Q} +FILES_SUBST+= PKG_USER_SHELL=${_PKG_USER_SHELL:Q} # REMOVE: after 2005Q4 .if !empty(PKG_USERS:M*\\\\*) @@ -288,7 +288,7 @@ RCD_SCRIPTS?= # empty RCD_SCRIPTS_MODE?= 0755 RCD_SCRIPTS_EXAMPLEDIR= share/examples/rc.d RCD_SCRIPTS_SHELL?= ${SH} -FILES_SUBST+= RCD_SCRIPTS_SHELL=${RCD_SCRIPTS_SHELL} +FILES_SUBST+= RCD_SCRIPTS_SHELL=${RCD_SCRIPTS_SHELL:Q} MESSAGE_SUBST+= RCD_SCRIPTS_DIR=${RCD_SCRIPTS_DIR} MESSAGE_SUBST+= RCD_SCRIPTS_EXAMPLEDIR=${RCD_SCRIPTS_EXAMPLEDIR} @@ -565,10 +565,10 @@ PKG_CREATE_USERGROUP?= YES PKG_CONFIG?= YES PKG_RCD_SCRIPTS?= NO PKG_REGISTER_SHELLS?= YES -FILES_SUBST+= PKG_CREATE_USERGROUP=${PKG_CREATE_USERGROUP} -FILES_SUBST+= PKG_CONFIG=${PKG_CONFIG} -FILES_SUBST+= PKG_RCD_SCRIPTS=${PKG_RCD_SCRIPTS} -FILES_SUBST+= PKG_REGISTER_SHELLS=${PKG_REGISTER_SHELLS} +FILES_SUBST+= PKG_CREATE_USERGROUP=${PKG_CREATE_USERGROUP:Q} +FILES_SUBST+= PKG_CONFIG=${PKG_CONFIG:Q} +FILES_SUBST+= PKG_RCD_SCRIPTS=${PKG_RCD_SCRIPTS:Q} +FILES_SUBST+= PKG_REGISTER_SHELLS=${PKG_REGISTER_SHELLS:Q} # Substitute for various programs used in the DEINSTALL/INSTALL scripts and # in the rc.d scripts. |