Fix valgrind call from when parser dinks with getenv
[awesomized/libmemcached] / Makefile.am
index 6581b2aa0cd6dd52ef21610b73a7aa2f9ac8252b..e64231fe030ce35f3f2797b7c93592738bee31bd 100644 (file)
@@ -52,6 +52,8 @@ include tests/include.am
 include util/include.am
 include win32/include.am
 
+include m4/include.am
+
 if HAVE_LIBEVENT
 include memcached/include.am
 libtest_libtest_la_DEPENDENCIES+= memcached/memcached
@@ -68,9 +70,9 @@ merge-clean:
        @find ./ | $(GREP) \.gcno | xargs rm -f
        @find ./ | $(GREP) \.gz | xargs rm -f
        @find ./ | $(GREP) \.moved | xargs rm -r -f
-       @find ./ | $(GREP) \.orig | xargs rm -f
+       @find ./ | $(GREP) \\.orig | xargs rm -f
        @find ./ | $(GREP) \.rej | xargs rm -f
-       @rm *\.rpm
+       @rm -f *\.rpm
        @find ./ | $(GREP) \.THIS | xargs rm -f
        @find ./ | $(GREP) \.OTHER | xargs rm -f
        @find ./ | $(GREP) \.BASE | xargs rm -f