From 266839eee9b3695b265868365ee87d7ebeba41be Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Fri, 18 Feb 2000 20:28:36 +0000 Subject: [PATCH] wx-config is configurable... git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6141 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- utils/wxPython/distrib/build.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/utils/wxPython/distrib/build.py b/utils/wxPython/distrib/build.py index ea70773436..834dd25817 100755 --- a/utils/wxPython/distrib/build.py +++ b/utils/wxPython/distrib/build.py @@ -277,9 +277,9 @@ class BuildConfig: self.HELPERLIB = 'wxPyHelpers' self.HELPERLIBDIR = '/usr/local/lib' self.CFLAGS = '-DSWIG_GLOBAL -DHAVE_CONFIG_H $(THREAD) -I. '\ - '`wx-config --cflags` -I$(PYINCLUDE) -I$(EXECINCLUDE) '\ + '`$(WXCONFIG) --cflags` -I$(PYINCLUDE) -I$(EXECINCLUDE) '\ '-I$(WXPSRCDIR)' - self.LFLAGS = '-L$(WXPSRCDIR) `wx-config --libs`' + self.LFLAGS = '-L$(WXPSRCDIR) `$(WXCONFIG) --libs`' self.LIBS = '-l$(HELPERLIB)' self.RMCMD = '-rm -f ' @@ -322,12 +322,12 @@ class BuildConfig: # so we can do some sanity checking... if sys.platform != 'win32': if not self.CCC: - self.CCC = os.popen('wx-config --cxx', 'r').read()[:-1] + self.CCC = os.popen('$(WXCONFIG) --cxx', 'r').read()[:-1] if not self.CCC: print "Warning: C++ compiler not specified (CCC). Assuming c++" self.CCC = 'c++' if not self.CC: - self.CCC = os.popen('wx-config --cc', 'r').read()[:-1] + self.CCC = os.popen('$(WXCONFIG) --cc', 'r').read()[:-1] if not self.CC: print "Warning: C compiler not specified (CC). Assuming cc" self.CC = 'cc' @@ -678,7 +678,7 @@ GENCODEDIR = %(GENCODEDIR)s WXPSRCDIR = %(WXPSRCDIR)s HELPERLIB = %(HELPERLIB)s HELPERLIBDIR = %(HELPERLIBDIR)s - +WXCONFIG=wx-config TARGETDIR = %(TARGETDIR)s