use single quotes, it seems at least we need this, bug #285720

svn path=/main/branches/prefix/; revision=14552

diff --git a/cnf/make.globals b/cnf/make.globals
index 7f67ed0e4d12b22638862d14b9e6e281aee0ebd2..2e54d240912196ac28757e57a60bd1fbc6b2b7e5 100644 (file)
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@ -89,9 +89,9 @@ CONFIG_PROTECT="/etc"
 USE_ORDER="env:pkg:conf:defaults:pkginternal:env.d"
 
 # Default portage user/group
-PORTAGE_USER="@portageuser@"
-PORTAGE_GROUP="@portagegroup@"
-PORTAGE_ROOT_USER="@rootuser@"
+PORTAGE_USER='@portageuser@'
+PORTAGE_GROUP='@portagegroup@'
+PORTAGE_ROOT_USER='@rootuser@'
 
 # Default ownership of installed files.
 PORTAGE_INST_UID="@rootuid@"

diff --git a/subst-install.in b/subst-install.in
index 050fd9a17a31bcf05d0ffecd025e3e8c54073c0b..01cd845ec7992c858adbacb58583bdb8aca161e6 100644 (file)
--- a/subst-install.in
+++ b/subst-install.in
@@ -9,9 +9,9 @@ exec_prefix="@exec_prefix@"
 # be a backreference) and hence escape those.  Eventually in strings we
 # need to escape the backslash too, such that the single backslash
 # doesn't get lost when considered an invalid escape
-rootuser="@rootuser@"
-portagegroup="@portagegroup@"
-portageuser="@portageuser@"
+rootuser='@rootuser@'
+portagegroup='@portagegroup@'
+portageuser='@portageuser@'
 rootuser=${rootuser//\\/\\\\}
 portagegroup=${portagegroup//\\/\\\\\\\\}
 portageuser=${portageuser//\\/\\\\\\\\}