summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell Bryant <russell@russellbryant.com>2006-05-11 10:28:37 +0000
committerRussell Bryant <russell@russellbryant.com>2006-05-11 10:28:37 +0000
commit1a8f3dd2d2dcfed82c46c4e691b2fedd9af29eba (patch)
treed73e9f47854ee3aecf3732f78cd1d022a86f848a
parenta5413095996b2b950acb9c5173cec97dbf6d830f (diff)
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
-rw-r--r--Makefile2
-rwxr-xr-xbuild_tools/make_buildopts_h2
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 66e7b08cf..cf84944fa 100644
--- 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 9ee20bc5a..f4db2a687 100755
--- 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