Changeset 5281 for pjproject

Timestamp:

May 3, 2016 4:27:07 AM (8 years ago)

Author:

nanang

Message:

Misc (re #1882): Update Python setup.py to get 'make' from environment variable MAKE, if it doesn't exist, just use 'make'. On some systems, such as FreeBSD, default 'make' command is not GNU compatible.

Thanks George Joseph for the patch.

Location:

pjproject/trunk/pjsip-apps/src

Files:

• python/setup.py (modified) (3 diffs)
• swig/python/setup.py (modified) (4 diffs)

pjproject/trunk/pjsip-apps/src/python/setup.py

@@ -62 +62 @@
 #print 'PJ_VERSION = "'+ pj_version + '"'
 
+# Get 'make' from environment variable if any
+MAKE = os.environ.get('MAKE') or "make"
 
 # Fill in pj_inc_dirs
 pj_inc_dirs = []
-f = os.popen("make -f helper.mak inc_dir")
+f = os.popen("%s -f helper.mak inc_dir" % MAKE)
 for line in f:
     pj_inc_dirs.append(line.rstrip("\r\n"))
@@ -72 +74 @@
 # Fill in pj_lib_dirs
 pj_lib_dirs = []
-f = os.popen("make -f helper.mak lib_dir")
+f = os.popen("%s -f helper.mak lib_dir" % MAKE)
 for line in f:
     pj_lib_dirs.append(line.rstrip("\r\n"))
@@ -79 +81 @@
 # Fill in pj_libs
 pj_libs = []
-f = os.popen("make -f helper.mak libs")
+f = os.popen("%s -f helper.mak libs" % MAKE)
 for line in f:
     pj_libs.append(line.rstrip("\r\n"))

pjproject/trunk/pjsip-apps/src/swig/python/setup.py

@@ -62 +62 @@
 #print 'PJ_VERSION = "'+ pj_version + '"'
 
+# Get 'make' from environment variable if any
+MAKE = os.environ.get('MAKE') or "make"
+
 # Get targetname
-f = os.popen("make --no-print-directory -f helper.mak target_name")
+f = os.popen("%s --no-print-directory -f helper.mak target_name" % MAKE)
 pj_target_name = f.read().rstrip("\r\n")
 f.close()
@@ -69 +72 @@
 # Fill in extra_compile_args
 extra_compile_args = []
-f = os.popen("make --no-print-directory -f helper.mak cflags")
+f = os.popen("%s --no-print-directory -f helper.mak cflags" % MAKE)
 for line in f:
     extra_compile_args.append(line.rstrip("\r\n"))
@@ -76 +79 @@
 # Fill in libraries
 libraries = []
-f = os.popen("make --no-print-directory -f helper.mak libs")
+f = os.popen("%s --no-print-directory -f helper.mak libs" % MAKE)
 for line in f:
     libraries.append(line.rstrip("\r\n"))
@@ -83 +86 @@
 # Fill in extra_link_args
 extra_link_args = []
-f = os.popen("make --no-print-directory -f helper.mak ldflags")
+f = os.popen("%s --no-print-directory -f helper.mak ldflags" % MAKE)
 for line in f:
     extra_link_args.append(line.rstrip("\r\n"))