summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorPerry Ismangil <perry@teluu.com>2011-07-22 11:52:50 +0000
committerPerry Ismangil <perry@teluu.com>2011-07-22 11:52:50 +0000
commitdcd416b3403767b56b5bcbc7c1cc03dd5bbf878a (patch)
treee500ba85b30b3a076daa5831a068aa7445d2b877 /Makefile
parenta25a91ecc867db804d45b2c517925eef18e781f6 (diff)
Fixed #1336 make doc now creates version specific docs
git-svn-id: http://svn.pjsip.org/repos/pjproject/branches/1.x@3677 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