[brlcad-commits] SF.net SVN: brlcad:[41476] brlcad/trunk/autogen.sh
Open Source Solid Modeling CAD
Brought to you by:
brlcad
From: <br...@us...> - 2010-11-29 23:06:58
|
Revision: 41476 http://brlcad.svn.sourceforge.net/brlcad/?rev=41476&view=rev Author: brlcad Date: 2010-11-29 23:06:51 +0000 (Mon, 29 Nov 2010) Log Message: ----------- grep the right Makefile.am file. Modified Paths: -------------- brlcad/trunk/autogen.sh Modified: brlcad/trunk/autogen.sh =================================================================== --- brlcad/trunk/autogen.sh 2010-11-29 22:57:26 UTC (rev 41475) +++ brlcad/trunk/autogen.sh 2010-11-29 23:06:51 UTC (rev 41476) @@ -1002,10 +1002,11 @@ $VERBOSE_ECHO "${_marker_found_message}`basename \"$CONFIGURE\"`" break fi - if test -f "`dirname \"$CONFIGURE\"/Makefile.am`" ; then - _marker_found="`grep 'AUTOMAKE_OPTIONS.*'${marker} Makefile.am`" + __makefile=`dirname \"$CONFIGURE\"/Makefile.am` + if test -f "$__makefile" ; then + _marker_found="`grep 'AUTOMAKE_OPTIONS.*'${marker} $__makefile`" if [ ! "x$_marker_found" = "x" ] ; then - $VERBOSE_ECHO "${_marker_found_message}Makefile.am" + $VERBOSE_ECHO "${_marker_found_message}${__makefile}" break fi fi @@ -1027,7 +1028,8 @@ $ECHO "for you since you do not have a 'foreign' declaration specified." $ECHO $ECHO "Consider adding 'foreign' to AM_INIT_AUTOMAKE in `basename \"$CONFIGURE\"`" - if test -f "`dirname \"$CONFIGURE\"/Makefile.am`" ; then + __makefile=`dirname \"$CONFIGURE\"/Makefile.am` + if test -f "$__makefile" ; then $ECHO "or to AUTOMAKE_OPTIONS in your top-level Makefile.am file." fi $ECHO This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |