]>
Commit | Line | Data |
---|---|---|
cd658d63 MŁ |
1 | diff -uNr atmelwlandriver.orig/src/apps/winter/Makefile.rules atmelwlandriver/src/apps/winter/Makefile.rules |
2 | --- atmelwlandriver.orig/src/apps/winter/Makefile.rules 2005-07-22 09:37:22.000000000 +0200 | |
3 | +++ atmelwlandriver/src/apps/winter/Makefile.rules 2006-04-11 20:05:40.000000000 +0200 | |
dd720771 | 4 | @@ -5,9 +5,9 @@ |
5 | ||
6 | all: postmake | |
7 | ||
8 | -CC:=$(shell wx-config --cxx) | |
9 | -CFLAGS:=$(shell wx-config --cxxflags) -I$(INC_DIR) -I$(RSRC_DIR) $(ARCH_SPECIFIC_CFLAGS) | |
10 | -CFLAGS1:=$(shell wx-config --libs) | |
cd658d63 MŁ |
11 | +CC:=$(shell $(WXCONFIG) --cxx) |
12 | +CFLAGS:=$(shell $(WXCONFIG) --cxxflags) -I$(INC_DIR) -I$(RSRC_DIR) $(ARCH_SPECIFIC_CFLAGS) | |
13 | +CFLAGS1:=$(shell $(WXCONFIG) --libs) | |
dd720771 | 14 | |
15 | VPATH:=$(INC_DIR) $(SRC_DIR) $(RSRC_DIR) | |
16 | ||
cd658d63 | 17 | @@ -20,13 +20,13 @@ |
dd720771 | 18 | wxconfig: |
19 | @config_exists=no;\ | |
20 | for path_dir in `echo $(PATH) | tr : ' '`; do\ | |
21 | - if test -f $$path_dir/wx-config; then\ | |
cd658d63 | 22 | + if test -f $$path_dir/$(WXCONFIG); then\ |
dd720771 | 23 | config_exists=yes;\ |
24 | fi\ | |
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.';\ |