]>
Commit | Line | Data |
---|---|---|
1bba8d54 ER |
1 | --- atmelwlandriver/src/apps/winter/Makefile.rules 2006-04-11 20:05:40.000000000 +0200 |
2 | +++ atmelwlandriver/src/apps/winter/Makefile.rules 2011-08-23 07:29:34.426583091 +0300 | |
dd720771 | 3 | @@ -5,9 +5,9 @@ |
4 | ||
5 | all: postmake | |
6 | ||
7 | -CC:=$(shell wx-config --cxx) | |
8 | -CFLAGS:=$(shell wx-config --cxxflags) -I$(INC_DIR) -I$(RSRC_DIR) $(ARCH_SPECIFIC_CFLAGS) | |
9 | -CFLAGS1:=$(shell wx-config --libs) | |
cd658d63 MŁ |
10 | +CC:=$(shell $(WXCONFIG) --cxx) |
11 | +CFLAGS:=$(shell $(WXCONFIG) --cxxflags) -I$(INC_DIR) -I$(RSRC_DIR) $(ARCH_SPECIFIC_CFLAGS) | |
12 | +CFLAGS1:=$(shell $(WXCONFIG) --libs) | |
dd720771 | 13 | |
14 | VPATH:=$(INC_DIR) $(SRC_DIR) $(RSRC_DIR) | |
15 | ||
cd658d63 | 16 | @@ -20,13 +20,13 @@ |
dd720771 | 17 | wxconfig: |
18 | @config_exists=no;\ | |
19 | for path_dir in `echo $(PATH) | tr : ' '`; do\ | |
20 | - if test -f $$path_dir/wx-config; then\ | |
cd658d63 | 21 | + if test -f $$path_dir/$(WXCONFIG); then\ |
dd720771 | 22 | config_exists=yes;\ |
1bba8d54 ER |
23 | - fi\ |
24 | + fi;\ | |
dd720771 | 25 | done;\ |
cd658d63 MŁ |
26 | if test $$config_exists = 'no'; then\ |
27 | echo 'It seems that the wxWindows library is not installed.';\ | |
28 | - echo 'wx-config, the script providing information about wxWindows';\ | |
29 | + echo '$(WXCONFIG), the script providing information about wxWindows';\ | |
30 | echo 'installation, is missing. Please, refer to the README.linux';\ | |
31 | echo 'or visit www.wxwindows.org for further information.';\ | |
32 | echo 'We are sorry about the inconvenience.';\ |