meta.sr.ht: Re: FreeBSD installation v1 PROPOSED

Thomas Schneider: 1
 Allow override of make program via environment

 1 files changed, 2 insertions(+), 1 deletions(-)

Thanks!

To git.sr.ht:~sircmpwn/meta.sr.ht
   d410f86..9bc9352  master -> master

[PATCH meta.sr.ht] Allow override of make program via environment Export this patch

On FreeBSD and other systems, `make` is not GNU make, and not compatible with
the sr.ht makefiles.
---
 setup.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index e0ccd32..9383731 100755
--- a/setup.py
+++ b/setup.py
@@ -28,7 +28,8 @@ else:
             "The $SRHT_PATH environment variable points to an invalid "
             "directory: {}".format(srht_path))
 
-subp = subprocess.run(["make", "SRHT_PATH=" + srht_path])
+make = os.environ.get("MAKE") or "make"

Scott Stevenson <scott@stevenson.io>

5 years ago

This can be expressed a bit more succinctly as

    os.getenv("MAKE", "make")

+subp = subprocess.run([make, "SRHT_PATH=" + srht_path])
 if subp.returncode != 0:
     sys.exit(subp.returncode)
 
-- 
2.21.0

Drew DeVault <sir@cmpwn.com>

5 years ago

Thanks!

To git.sr.ht:~sircmpwn/meta.sr.ht
   d410f86..9bc9352  master -> master