summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorPerry Ismangil <perry@teluu.com>2011-07-19 21:42:58 +0000
committerPerry Ismangil <perry@teluu.com>2011-07-19 21:42:58 +0000
commit6ad90be1df339da1ae65328c738d60e142b13efe (patch)
treeb14aaf27ad7b0cbc1ced148200b7942d66e371b7 /Makefile
parentbbbd60d82b63c214eb9ac1a4a716393b06cc3217 (diff)
Re #1254 Doxygen configuration and makefile changes to support version specific documentation
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3669 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 51459931..dcfe0b1f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
include build.mak
include build/host-$(HOST_NAME).mak
-include user.mak
+include version.mak
DIRS = pjlib/build pjlib-util/build pjnath/build third_party/build pjmedia/build pjsip/build pjsip-apps/build $(EXTRA_DIRS)
@@ -23,7 +24,7 @@ doc:
exit 1; \
fi
for dir in $(DIRS); do \
- if $(MAKE) $(MAKE_FLAGS) -C $$dir/build $@; then \
+ if $(MAKE) $(MAKE_FLAGS) -C $$dir $@; then \
true; \
else \
exit 1; \
@@ -92,7 +93,6 @@ pjsua-test:
cd tests/pjsua && python runall.py
prefix = $(ac_prefix)
-include version.mak
install:
mkdir -p $(DESTDIR)$(prefix)/lib