diff options
author | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2005-12-02 00:58:55 +0000 |
---|---|---|
committer | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2005-12-02 00:58:55 +0000 |
commit | 89e60dcfb9a56fe8e0525b3d9090102f8ff942b9 (patch) | |
tree | ff0af4b1ec573dc8f87f69501152180aa211dd40 | |
parent | b8a3a6237d1c3b064db52fb8a20ad2123f760a89 (diff) |
Merged revisions 841,843 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.2
........
r841 | kpfleming | 2005-12-01 17:14:59 -0600 (Thu, 01 Dec 2005) | 2 lines
Makefile 'update' target now supports updating from Subversion repositories (issue #5875)
........
r843 | russell | 2005-12-01 18:03:01 -0600 (Thu, 01 Dec 2005) | 2 lines
fix udev support for 2.6.15 (issue #5891)
........
git-svn-id: http://svn.digium.com/svn/zaptel/trunk@844 5390a7c7-147a-4af0-8ec9-7488f05a26cb
-rw-r--r-- | Makefile | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -394,11 +394,14 @@ config: fi update: - @if [ -d CVS ]; then \ + @if [ -d .svn ]; then \ + echo "Updating from Subversion..." ; \ + svn update -q; \ + elif [ -d CVS ]; then \ echo "Updating from CVS..." ; \ cvs -q -z3 update -Pd; \ else \ - echo "Not CVS"; \ + echo "Not under version control"; \ fi clean: |