[asterisk-commits] trunk r26850 - in /trunk: Makefile build_tools/make_buildopts_h

[asterisk-commits at lists.digium.com]

Author: russell
Date: Thu May 11 05:28:37 2006
New Revision: 26850

URL: http://svn.digium.com/view/asterisk?rev=26850&view=rev
Log:
forcing a dist-clean in the cleantest was a bad idea.  Just change the script
that generates buildopts.h to handle old menuselect.makeopts files

Modified:
    trunk/Makefile
    trunk/build_tools/make_buildopts_h

Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/Makefile?rev=26850&r1=26849&r2=26850&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Thu May 11 05:28:37 2006
@@ -965,7 +965,7 @@
 
 cleantest:
 	@if cmp -s .cleancount .lastclean ; then echo ; else \
-		$(MAKE) dist-clean; cp -f .cleancount .lastclean;\
+		$(MAKE) clean; cp -f .cleancount .lastclean;\
 	fi
 
 _uninstall:

Modified: trunk/build_tools/make_buildopts_h
URL: http://svn.digium.com/view/asterisk/trunk/build_tools/make_buildopts_h?rev=26850&r1=26849&r2=26850&view=diff
==============================================================================
--- trunk/build_tools/make_buildopts_h (original)
+++ trunk/build_tools/make_buildopts_h Thu May 11 05:28:37 2006
@@ -7,7 +7,7 @@
  */
 
 END
-TMP=`grep MENUSELECT_CFLAGS menuselect.makeopts | sed s/MENUSELECT_CFLAGS\=//g`
+TMP=`grep MENUSELECT_CFLAGS menuselect.makeopts | sed s/MENUSELECT_CFLAGS\=//g | sed s/-D//g`
 for x in ${TMP}; do
      echo "#define ${x}"
 done