From: Noel Power <noel.power@suse.com>
Date: Thu, 8 May 2025 19:28:54 +0000 (+0100)
Subject: wafsamba: Adjust for waf 2.1.5 case of some Options.options attributes
X-Git-Tag: tevent-0.17.0~165
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c7d3cc74b84cf4f88fcd0397320564fe2565804;p=thirdparty%2Fsamba.git

wafsamba: Adjust for waf 2.1.5 case of some Options.options attributes

Some dynamic attribute names  for some variables have changed
from uppercase to lowercase with waf 2.1.5

e.g.

  Options.options.LIBDIR  -> Options.options.libdir
  Options.options.BINDIR  -> Options.options.bindir
  Options.options.SBINDIR -> Options.options.sbindir

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
---

diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript
index 3d49907e3bb..1f69510c9bb 100644
--- a/buildtools/wafsamba/wscript
+++ b/buildtools/wafsamba/wscript
@@ -331,9 +331,9 @@ def configure(conf):
         conf.load('gccdeps')
 
     # make the install paths available in environment
-    conf.env.LIBDIR = Options.options.LIBDIR or '${PREFIX}/lib'
-    conf.env.BINDIR = Options.options.BINDIR or '${PREFIX}/bin'
-    conf.env.SBINDIR = Options.options.SBINDIR or '${PREFIX}/sbin'
+    conf.env.LIBDIR = Options.options.libdir or '${PREFIX}/lib'
+    conf.env.BINDIR = Options.options.bindir or '${PREFIX}/bin'
+    conf.env.SBINDIR = Options.options.sbindir or '${PREFIX}/sbin'
     conf.env.MODULESDIR = Options.options.MODULESDIR
     conf.env.PRIVATELIBDIR = Options.options.PRIVATELIBDIR
     conf.env.BUNDLED_LIBS = Options.options.BUNDLED_LIBS.split(',')