[asterisk-scf-commits] asterisk-scf/integration/testsuite.git branch "review" updated.

[Commits to the Asterisk SCF project code repositories]

branch "review" has been updated
       via  81f926a751bcce3087a207ddd586412df02a8948 (commit)
      from  6963b6e5ef916a3fe2e5f77d721f0bd9287a8108 (commit)

Summary of changes:
 Makefile |   61 ++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 32 insertions(+), 29 deletions(-)


- Log -----------------------------------------------------------------
commit 81f926a751bcce3087a207ddd586412df02a8948
Author: Darren Sessions <dsessions at digium.com>
Date:   Mon Jun 13 21:30:49 2011 -0500

    Obviously been a little while since I have done a makefile from scratch. Replaced the space indents with tabs.

diff --git a/Makefile b/Makefile
index ce6c25a..e8c80fc 100644
--- a/Makefile
+++ b/Makefile
@@ -4,37 +4,40 @@ INSTALLDIR=/usr/local/testsuite
 all:
 
 all: _all
-    @echo ""
-    @echo "     _            _                   _ _         "
-    @echo "    | |_ ___  ___| |_       ___ _   _(_) |_ ___   "
-    @echo "    | __/ _ \/ __| __|_____/ __| | | | | __/ _ \  "
-    @echo "    | ||  __/\__ \ ||______\__ \ |_| | | ||  __/  "
-    @echo "     \__\___||___/\__|     |___/\__,_|_|\__\___|  "
-    @echo ""
-    @echo "   +----- Test-Suite Installation Complete -----+ "  
-    @echo "   +                                            + "
-    @echo "   +  The test-suite is now installed. An init  + "
-    @echo "   +  script to fully automate the startup and  + "
-    @echo "   +   and shutdown of the test-suite remote    + "
-    @echo "   +  agent is highly recommended. Sample init  + "
-    @echo "   +   scripts are provided in the 'contrib'    + "
-    @echo "   +                directory.                  + "
-    @echo "   +                                            + "
-    @echo "   +--------------------------------------------+ "  
-    @echo ""
+	@echo ""
+	@echo "     _            _                   _ _         "
+	@echo "    | |_ ___  ___| |_       ___ _   _(_) |_ ___   "
+	@echo "    | __/ _ \/ __| __|_____/ __| | | | | __/ _ \  "
+	@echo "    | ||  __/\__ \ ||______\__ \ |_| | | ||  __/  "
+	@echo "     \__\___||___/\__|     |___/\__,_|_|\__\___|  "
+	@echo ""
+	@echo "   +----- Test-Suite Installation Complete -----+ "  
+	@echo "   +                                            + "
+	@echo "   +  The test-suite is now installed. An init  + "
+	@echo "   +  script to fully automate the startup and  + "
+	@echo "   +   and shutdown of the test-suite remote    + "
+	@echo "   +  agent is highly recommended. Sample init  + "
+	@echo "   +   scripts are provided in the 'contrib'    + "
+	@echo "   +                directory.                  + "
+	@echo "   +                                            + "
+	@echo "   +--------------------------------------------+ "  
+	@echo ""
 
-_all: check install
+_all: usercheck install
 
-check:
-    if test $$USER != "root" ; then
-        echo "The test-suite must be installed, and ran, as root."
-        exit 1
-    fi
+usercheck:
+ifneq ($(USER),root)
+	@echo ""
+	@echo "   ---------------------------------------------------"
+	@echo "   The test-suite must be installed, and ran, as root."
+	@echo "   ---------------------------------------------------"
+	@echo ""
+	@exit 1
+endif
 
 install:
-    @test -d $(INSTALLDIR) || mkdir -p $(INSTALLDIR)
+	@test -d $(INSTALLDIR) || mkdir -p $(INSTALLDIR)
 
-    @for f in *; do \
-        test -f $$f && \
-        cp -p $$f $(INSTALLDIR); \
-    done
+	@for f in *; do \
+		test -f $$f && \
+		cp -p $$f $(INSTALLDIR); \

-----------------------------------------------------------------------


-- 
asterisk-scf/integration/testsuite.git