aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2008-01-29 17:43:41 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2008-01-29 17:43:41 +0000
commit54b783d6f51819b094bbcee7123677b8912f5ddd (patch)
tree09fe426410b2c4725addddcb69a40883eaa78e6a
parent19d24feb33da21deb1561a65355a1f99c62356a8 (diff)
Fix the last couple of issues related to building from a path that contains spaces.
(closes issue #11834) git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@100932 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--main/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/main/Makefile b/main/Makefile
index 138d9b118..204e7dff6 100644
--- a/main/Makefile
+++ b/main/Makefile
@@ -99,11 +99,11 @@ ifeq ($(OSARCH),SunOS)
endif
editline/libedit.a:
- cd editline && test -f config.h || CFLAGS="$(PTHREAD_CFLAGS) $(ASTCFLAGS:-Werror=)" LDFLAGS="$(ASTLDFLAGS)" ./configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --with-ncurses=$(NCURSES_DIR) --with-curses=$(CURSES_DIR) --with-termcap=$(TERMCAP_DIR) --with-tinfo=$(TINFO_DIR)
+ cd editline && test -f config.h || CFLAGS="$(PTHREAD_CFLAGS) $(subst $(ASTTOPDIR),../../,$(ASTCFLAGS:-Werror=))" LDFLAGS="$(ASTLDFLAGS)" ./configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --with-ncurses=$(NCURSES_DIR) --with-curses=$(CURSES_DIR) --with-termcap=$(TERMCAP_DIR) --with-tinfo=$(TINFO_DIR)
$(MAKE) -C editline libedit.a
db1-ast/libdb1.a:
- CFLAGS="$(ASTCFLAGS)" LDFLAGS="$(ASTLDFLAGS)" $(MAKE) -C db1-ast libdb1.a
+ CFLAGS="$(subst $(ASTTOPDIR),../../,$(ASTCFLAGS))" LDFLAGS="$(ASTLDFLAGS)" $(MAKE) -C db1-ast libdb1.a
ast_expr2.c ast_expr2.h:
bison -o $@ -d --name-prefix=ast_yy ast_expr2.y