- Timestamp:
- Dec 28, 2016 3:40:07 AM (7 years ago)
- Location:
- pjproject/branches/projects/uwp
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
pjproject/branches/projects/uwp
- Property svn:mergeinfo changed
/pjproject/trunk (added) merged: 5209,5212-5234,5237-5253,5255,5257-5292,5294-5297,5299-5332,5334-5394,5396-5438,5440-5469,5471-5496,5498-5510
- Property svn:mergeinfo changed
-
pjproject/branches/projects/uwp/pjsip-apps/src/python/setup.py
r4232 r5513 62 62 #print 'PJ_VERSION = "'+ pj_version + '"' 63 63 64 # Get 'make' from environment variable if any 65 MAKE = os.environ.get('MAKE') or "make" 64 66 65 67 # Fill in pj_inc_dirs 66 68 pj_inc_dirs = [] 67 f = os.popen(" make -f helper.mak inc_dir")69 f = os.popen("%s -f helper.mak inc_dir" % MAKE) 68 70 for line in f: 69 71 pj_inc_dirs.append(line.rstrip("\r\n")) … … 72 74 # Fill in pj_lib_dirs 73 75 pj_lib_dirs = [] 74 f = os.popen(" make -f helper.mak lib_dir")76 f = os.popen("%s -f helper.mak lib_dir" % MAKE) 75 77 for line in f: 76 78 pj_lib_dirs.append(line.rstrip("\r\n")) … … 79 81 # Fill in pj_libs 80 82 pj_libs = [] 81 f = os.popen(" make -f helper.mak libs")83 f = os.popen("%s -f helper.mak libs" % MAKE) 82 84 for line in f: 83 85 pj_libs.append(line.rstrip("\r\n"))
Note: See TracChangeset
for help on using the changeset viewer.