diff options
| author | Heiko Becker <heirecka@exherbo.org> | 2020-12-03 21:04:26 +0100 |
|---|---|---|
| committer | Akira TAGOH <akira@tagoh.org> | 2021-03-03 04:54:33 +0000 |
| commit | 4e42925096e97f4a6c9d09f475de7eb54a226668 (patch) | |
| tree | a5d67cb010d01ed2ab85a925c6ba8ed3cad70feb /conf.d | |
| parent | 615e2cb844a7eb266aa562071a26093ae3ec4d28 (diff) | |
| download | fontconfig-4e42925096e97f4a6c9d09f475de7eb54a226668.tar.gz | |
Handle absolute sysconfdir when installing symlinks
sysconfdir defaults to /etc when the prefix is set to /usr. But joining
MESON_INSTALL_DESTDIR_PREFIX and sysconfdir when the latter is an
absoulte path, results in sysconfdir only. Which might lead to an error
during install because /etc/fonts/conf.d/ might already exist from an
pre-existing fontconfig installation.
Diffstat (limited to 'conf.d')
| -rw-r--r-- | conf.d/link_confs.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/conf.d/link_confs.py b/conf.d/link_confs.py index e195095..52b8093 100644 --- a/conf.d/link_confs.py +++ b/conf.d/link_confs.py @@ -12,7 +12,14 @@ if __name__=='__main__': parser.add_argument('links', nargs='+') args = parser.parse_args() - confpath = os.path.join(os.environ['MESON_INSTALL_DESTDIR_PREFIX'], args.confpath) + if os.path.isabs(args.confpath): + destdir = os.environ.get('DESTDIR') + if destdir: + confpath = os.path.join(destdir, args.confpath[1:]) + else: + confpath = args.confpath + else: + confpath = os.path.join(os.environ['MESON_INSTALL_DESTDIR_PREFIX'], args.confpath) if not os.path.exists(confpath): os.makedirs(confpath) |