gnucash-on-osx master: Fix setting the prefix and call setup_sdk at the beginning, not the end.

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash-on-osx/commit/3369a408 (commit)
	from  https://github.com/Gnucash/gnucash-on-osx/commit/47ab30b9 (commit)



commit 3369a4081ca21505d32cbe705bae895d3f21de7e
Author: John Ralls <jralls at ceridwen.us>
Date:   Mon Oct 31 10:12:29 2022 -0700

    Fix setting the prefix and call setup_sdk at the beginning, not the end.

diff --git a/jhbuildrc-custom b/jhbuildrc-custom
index dce73c3..d55830c 100644
--- a/jhbuildrc-custom
+++ b/jhbuildrc-custom
@@ -1,8 +1,15 @@
 # -*- mode: python -*-
 
-prefix = os.environ['PREFIX']
-checkoutroot = os.path.join(os.environ['HOME'], 'gnucash', 'src')
-buildroot = os.path.join(os.environ['HOME'], 'gnucash', 'build')
+setup_sdk()
+
+if 'PREFIX' in os.environ:
+    prefix = os.environ['PREFIX']
+else:
+    prefix = os.path.join(os.environ['HOME'], 'gnucash', 'inst')
+
+checkoutroot = os.path.join(os.path.dirname(prefix), 'src')
+buildroot = os.path.join(os.path.dirname(prefix), 'build')
+print("Building in %s", buildroot)
 moduleset = "https://github.com/gnucash/gnucash-on-osx/raw/master/modulesets/gnucash.modules"
 
 _modules_deps = ['pygments', 'meta-gtk-osx-bootstrap', 'meta-gtk-osx-gtk3',
@@ -35,4 +42,3 @@ os.environ['CPP_FOR_BUILD'] = os.environ['CC']
 os.environ['CFLAGS_FOR_BUILD'] = os.environ['CFLAGS']
 module_cmakeargs['boost'] = '-DCMAKE_CXX_FLAGS="' + os.environ['CXXFLAGS'] + ' -std=c++17"'
 
-setup_sdk()



Summary of changes:
 jhbuildrc-custom | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)