From d0891d5d26c98093229e94d56282300dfa8b72ac Mon Sep 17 00:00:00 2001
From: Tomoyasu Nojiri <68096132+t-nojiri@users.noreply.github.com>
Date: Fri, 15 Jan 2021 02:56:24 +0900
Subject: [PATCH] astyle: Fix makefile for install parameter (#20899)

---
 var/spack/repos/builtin/packages/astyle/package.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/var/spack/repos/builtin/packages/astyle/package.py b/var/spack/repos/builtin/packages/astyle/package.py
index dec9a49d7d..48e4ba5164 100644
--- a/var/spack/repos/builtin/packages/astyle/package.py
+++ b/var/spack/repos/builtin/packages/astyle/package.py
@@ -4,7 +4,6 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack import *
-import sys
 
 
 class Astyle(MakefilePackage):
@@ -32,9 +31,9 @@ def build_directory(self):
     def edit(self, spec, prefix):
         makefile = join_path(self.build_directory, 'Makefile')
         filter_file(r'^CXX\s*=.*', 'CXX=%s' % spack_cxx, makefile)
-        # strangely enough install -o $(USER) -g $(USER) stoped working on OSX
-        if sys.platform == 'darwin':
-            filter_file(r'^INSTALL=.*', 'INSTALL=install', makefile)
+        # If the group is not a user account, the installation will fail,
+        # so remove the -o $ (USER) -g $ (USER) parameter.
+        filter_file(r'^INSTALL=.*', 'INSTALL=install', makefile)
 
     @property
     def install_targets(self):