From f0ec6a994c6047d0f134ce592b27c63a73aa54ed Mon Sep 17 00:00:00 2001 From: Philipp Edelmann Date: Tue, 27 Sep 2022 10:44:19 -0600 Subject: pgplot: install rbg.txt and change PGPLOT_DIR (#32775) The file rbg.txt is needed for many PGPLOT application, such as the MESA stellar evolution code. This change installs the file to the PGPLOT_DIR, where the library expects it. PGPLOT_DIR was previously set to the prefix itself, which is an odd place to install rgb.txt. This commit changes it to lib/pgplot5, following the convention used by Debian. Co-authored-by: Philipp Edelmann --- var/spack/repos/builtin/packages/pgplot/package.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/pgplot/package.py b/var/spack/repos/builtin/packages/pgplot/package.py index f62ffd74a7..9425aacba6 100644 --- a/var/spack/repos/builtin/packages/pgplot/package.py +++ b/var/spack/repos/builtin/packages/pgplot/package.py @@ -161,6 +161,8 @@ class Pgplot(MakefilePackage): install("libpgplot.a", prefix.lib) install("libpgplot.so", prefix.lib) install("grfont.dat", prefix.include) + mkdirp(prefix.lib + "/pgplot5") + install("rgb.txt", prefix.lib + "/pgplot5") @property def libs(self): @@ -169,4 +171,4 @@ class Pgplot(MakefilePackage): def setup_run_environment(self, env): env.set("PGPLOT_FONT", self.prefix.include + "/grfont.dat") - env.set("PGPLOT_DIR", self.prefix) + env.set("PGPLOT_DIR", self.prefix.lib + "/pgplot5") -- cgit v1.2.3-60-g2f50