diff --git a/src/pam_panic_pw/man/Makefile.am b/src/pam_panic_pw/man/Makefile.am
index 936912f..c505b09 100644
--- a/src/pam_panic_pw/man/Makefile.am
+++ b/src/pam_panic_pw/man/Makefile.am
@@ -12,4 +12,4 @@ nobase_dist_cant_believe_its_not_man_DATA = \
 
 
 clean-local:
-	rm ./*/*.tmp ./*/*.gz ./*/*/*.tmp ./*/*/*.g
+	rm -f ./*/*.tmp ./*/*.gz ./*/*/*.tmp ./*/*/*.gz
diff --git a/test/Makefile.am b/test/Makefile.am
index 7d1dc92..01c80fa 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,4 +1,4 @@
-CFLAGS += -DTEST
+AM_CFLAGS = -DTEST
 bin_PROGRAMS = test
 test_SOURCES = ../src/pam_panic/pam_panic_authdevice.c ../src/pam_panic/pam_panic_reject.c test.c
 test_LDFLAGS = -lpam -lcunit