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.
------------------------------------------------------------------------------
Increase Visibility of Your 3D Game App & Earn a Chance To Win $500!
Tap into the largest installed PC base & get more eyes on your game by
optimizing for Intel(R) Graphics Technology. Get started today with the
Intel(R) Software Partner Program. Five $500 cash prizes are up for grabs.
http://p.sf.net/sfu/intelisp-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
