From 7424b4268f72bfd67947dddab7310439d7cec88f Mon Sep 17 00:00:00 2001 From: Jerry James Date: Dec 29 2020 22:28:51 +0000 Subject: Generate RPM macros instead of hardcoded paths --- diff --git a/opam2rpm/opamparser.py b/opam2rpm/opamparser.py index 125500e..4a390d1 100644 --- a/opam2rpm/opamparser.py +++ b/opam2rpm/opamparser.py @@ -1199,13 +1199,12 @@ class OpamParser: proc = subprocess.run(['rpm -q ocaml | cut -d- -f2'], capture_output=True, shell=True, text=True) ocaml_ver = proc.stdout.strip() if proc.returncode == 0 else '4.11.1' - libdir = os.path.dirname(os.path.dirname(get_python_lib(1))) # Global variables self.glbl = dict() self.glbl['arch'] = StrVal(platform.machine()) self.glbl['jobs'] = StrVal('%{_smp_build_ncpus}') - self.glbl['make'] = StrVal('/usr/bin/make') + self.glbl['make'] = StrVal('%{_bindir}/make') self.glbl['opam-version'] = StrVal('2.0.7') self.glbl['os'] = StrVal('linux') self.glbl['os-distribution'] = StrVal('fedora') @@ -1215,18 +1214,18 @@ class OpamParser: self.glbl['sys-ocaml-version'] = StrVal(ocaml_ver) # Switch variables - self.glbl['bin'] = StrVal('/usr/bin') - self.glbl['doc'] = StrVal('/usr/share/doc') - self.glbl['etc'] = StrVal('/etc') + self.glbl['bin'] = StrVal('%{_bindir}') + self.glbl['doc'] = StrVal('%{_docdir}') + self.glbl['etc'] = StrVal('%{_sysconfdir}') self.glbl['group'] = StrVal('mock') - self.glbl['lib'] = StrVal(libdir) - self.glbl['man'] = StrVal('/usr/share/man') - self.glbl['prefix'] = StrVal('/usr') - self.glbl['sbin'] = StrVal('/usr/sbin') - self.glbl['share'] = StrVal('/usr/share') - self.glbl['stublibs'] = StrVal(libdir + '/ocaml/stublibs') + self.glbl['lib'] = StrVal('%{_libdir}') + self.glbl['man'] = StrVal('%{_mandir}') + self.glbl['prefix'] = StrVal('%{_prefix}') + self.glbl['sbin'] = StrVal('%{_sbindir}') + self.glbl['share'] = StrVal('%{_datadir}') + self.glbl['stublibs'] = StrVal('%{_libdir}/ocaml/stublibs') self.glbl['switch'] = StrVal('default') - self.glbl['toplevel'] = StrVal(libdir + '/ocaml/toplevel') + self.glbl['toplevel'] = StrVal('%{_libdir}/ocaml/toplevel') self.glbl['user'] = StrVal('mockbuild') # Package variables that we can control