Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv13266
Modified Files:
Makefile vercomp.c
Log Message:
make version-testing and echo constructs more shell-portable
add proper attribution to vercomp.c
Index: Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/Makefile,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -d -r1.157 -r1.158
--- Makefile 19 May 2005 04:08:01 -0000 1.157
+++ Makefile 19 May 2005 14:53:56 -0000 1.158
@@ -357,22 +357,25 @@
ar r $@ $(FLEXOBJS)
ranlib $@
+ifeq ($(BISONVER_GE_1_85),false)
.y.c:
- @if (($(BISONVER_GE_1_85) = false)); then \
- echo
=================================================================================
;\
- echo NOTE: You may have trouble if you do not have bison-1.85
or higher installed! ;\
- echo NOTE: You can pick up a copy at: http://ftp.gnu.org/ or
its mirrors ;\
- echo NOTE: You have: $(BISONVER) ;\
- echo
================================================================================;
\
- fi
+ @echo
"================================================================================="
;\
+ echo "NOTE: You may have trouble if you do not have bison-1.85 or
higher installed!" ;\
+ echo "NOTE: You can pick up a copy at: http://ftp.gnu.org/ or its
mirrors" ;\
+ echo "NOTE: You have: $(BISONVER)" ;\
+ echo
"================================================================================"
;\
bison -v -d --name-prefix=ast_yy $< -o $@
+else
+.y.c:
+ bison -v -d --name-prefix=ast_yy $< -o $@
+endif
ast_expr.o:: ast_expr.c
- @echo
=================================================================================
;\
- echo NOTE: Using older version of expression parser. To use the newer
version, ;\
- echo NOTE: upgrade to flex 2.5.31 or higher, which can be found at ;\
- echo NOTE: http://sourceforge.net/project/showfiles.php?group_id=72099
;\
- echo
=================================================================================
;\
+ @echo
"================================================================================="
;\
+ echo "NOTE: Using older version of expression parser. To use the newer
version," ;\
+ echo "NOTE: upgrade to flex 2.5.31 or higher, which can be found at" ;\
+ echo "NOTE:
http://sourceforge.net/project/showfiles.php?group_id=72099"; ;\
+ echo
"================================================================================="
;\
ast_expr.o:: ast_expr.c
Index: vercomp.c
===================================================================
RCS file: /usr/cvsroot/asterisk/vercomp.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- vercomp.c 19 May 2005 04:08:01 -0000 1.1
+++ vercomp.c 19 May 2005 14:53:56 -0000 1.2
@@ -3,7 +3,7 @@
*
* A simple program version comparison tool.
*
- * Copyright (C) 2005, 'murf'.
+ * Copyright (C) 2005, Steven Michael Murphy (murf at e-tools dot com).
*
* This program is free software, distributed under the terms of
* the GNU General Public License
_______________________________________________
Asterisk-Cvs mailing list
[email protected]
http://lists.digium.com/mailman/listinfo/asterisk-cvs
