From 738c8754d154517c85072f1c27eaffbc8121bfb3 Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Mon, 26 Oct 2009 19:05:22 +0000 Subject: [PATCH] be more obvious when you can't do an update git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@15232 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- Makefile.am | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/Makefile.am b/Makefile.am index 24e5df613d..a6a228aa66 100644 --- a/Makefile.am +++ b/Makefile.am @@ -299,7 +299,17 @@ src/include/switch_version.h: $(top_srcdir)/src/include/switch_version.h.in .ver fi ; \ fi ; -update: +is-svn: + @if [ ! -d .svn ] ; then \ + echo ; echo ; \ + echo "**************************************************************************************************" ; \ + echo "You can not update a release tarball or without a svn working copy, please checkout fresh from svn" ; \ + echo "**************************************************************************************************" ; \ + echo ; echo ; \ + exit 1; \ + fi + +update: is-svn @if test -d .svn ; then \ test ! -f .version || rm -f .version ; \ echo Updating... ; \ @@ -357,17 +367,17 @@ core_install: install_core everything: install -up: clean +up: is-svn clean svn update $(MAKE) -j core $(MAKE) -j modules $(MAKE) install -sync: +sync: is-svn svn update $(MAKE) install -speedy-sync: +speedy-sync: is-svn svn update $(MAKE) -j install @@ -431,14 +441,14 @@ sofia-reconf: cd libs/sofia-sip && $(MAKE) clean cd libs/sofia-sip && ./configure --prefix=$(PREFIX) --with-pic --with-glib=no --disable-shared -current: update-clean +current: is-svn update-clean svn update $(MAKE) all $(MAKE) install installall: current -speedy-current: update-clean +speedy-current: is-svn update-clean svn update $(MAKE) speedy-sure $(MAKE) install