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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@26850 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/Makefile b/Makefile
index 66e7b08cf7fd1c5a3c1d424b546bf31488e91633..cf84944fa9d974310f95418474677c194aa3b45f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -965,7 +965,7 @@ env:
 
 cleantest:
        @if cmp -s .cleancount .lastclean ; then echo ; else \
-               $(MAKE) dist-clean; cp -f .cleancount .lastclean;\
+               $(MAKE) clean; cp -f .cleancount .lastclean;\
        fi
 
 _uninstall:

diff --git a/build_tools/make_buildopts_h b/build_tools/make_buildopts_h
index 9ee20bc5ae81d8dc931043af70141bc5cc224775..f4db2a6870a43b6edc974ab14f569001f5c108d0 100755 (executable)
--- a/build_tools/make_buildopts_h
+++ b/build_tools/make_buildopts_h
@@ -7,7 +7,7 @@ cat << END
  */
 
 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