From 6718c0edc9dfdb895250c50b3a8b75a64a4d189e Mon Sep 17 00:00:00 2001 From: Marc Hartmayer Date: Mon, 13 Jan 2025 17:48:21 +0000 Subject: [PATCH] common.mak: Introduce 'DATADIR' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This makes it easier to reuse. Stick to the conventions used by Meson [1]. [1] https://mesonbuild.com/Builtin-options.html#directories Reviewed-by: Steffen Eiden Signed-off-by: Marc Hartmayer Signed-off-by: Jan Höppner --- common.mak | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/common.mak b/common.mak index 795d03d2..02f86975 100644 --- a/common.mak +++ b/common.mak @@ -265,9 +265,10 @@ LIBDIR = $(INSTALLDIR)/lib USRLIBDIR = $(INSTALLDIR)/usr/lib USRLIB64DIR = $(INSTALLDIR)/usr/lib64 SYSCONFDIR = $(INSTALLDIR)/etc -MANDIR = $(INSTALLDIR)/usr/share/man +DATADIR = $(INSTALLDIR)/usr/share +MANDIR = $(DATADIR)/man VARDIR = $(INSTALLDIR)/var -TOOLS_DATADIR = $(INSTALLDIR)/usr/share/s390-tools +TOOLS_DATADIR = $(DATADIR)/s390-tools TOOLS_LIBDIR = $(INSTALLDIR)/lib/s390-tools ZFCPDUMP_DIR = $(TOOLS_LIBDIR)/zfcpdump # Systemd support files are installed only if a directory is specified