[svn-commits] tzafrir: tools/trunk r6657 - /tools/trunk/Makefile

[SVN commits to the Digium repositories]

Author: tzafrir
Date: Tue May 26 04:55:06 2009
New Revision: 6657

URL: http://svn.asterisk.org/svn-view/dahdi?view=rev&rev=6657
Log:
Reword the message after 'make config' for the case no hardware found

Check the output of dahdi_hardware and give a different message for the
case it found no hardware.

(closes issue #14792)
Reported by: Dovid
Patches:
      dahdi_hardware_nodev_make.diff uploaded by tzafrir (license 46)


Modified:
    tools/trunk/Makefile

Modified: tools/trunk/Makefile
URL: http://svn.asterisk.org/svn-view/dahdi/tools/trunk/Makefile?view=diff&rev=6657&r1=6656&r2=6657
==============================================================================
--- tools/trunk/Makefile (original)
+++ tools/trunk/Makefile Tue May 26 04:55:06 2009
@@ -294,13 +294,17 @@
 endif
 	@echo "DAHDI has been configured."
 	@echo ""
-	@echo "If you have any DAHDI hardware it is now recommended you "
-	@echo "edit /etc/dahdi/modules in order to load support for only"
-	@echo "the DAHDI hardware installed in this system.  By default "
-	@echo "support for all DAHDI hardware is loaded at DAHDI start. "
+	@echo "List of detected DAHDI devices:"
 	@echo ""
-	@echo "I think that the DAHDI hardware you have on your system is:"
-	@xpp/dahdi_hardware || true
+	@if [ `xpp/dahdi_hardware | tee /dev/stderr | wc -l` -eq 0 ]; then \
+		echo "No hardware found"; \
+	else \
+		@echo ""; \
+		echo "run 'dahdi_genconf modules' to load support for only " ;\
+		echo "the DAHDI hardware installed in this system.  By "; \
+		echo "default support for all DAHDI hardware is loaded at "; \
+		echo "DAHDI start. "; \
+	fi
 
 update:
 	@if [ -d .svn ]; then \