--- Makefile.orig	2009-08-11 13:20:48.000000000 -0700
+++ Makefile	2009-08-11 13:22:32.000000000 -0700
@@ -130,14 +130,12 @@
 	for hdr in $(INST_HEADERS); do \
 		install -D -m 644 include/dahdi/$$hdr $(DESTDIR)/usr/include/dahdi/$$hdr; \
 	done
-	-@rm -f $(DESTDIR)/usr/include/zaptel/*.h
-	-@rmdir $(DESTDIR)/usr/include/zaptel
+
+uninstall-zaptel-headers:
+	rm -rf $(DESTDIR)/usr/include/zaptel
 
 uninstall-include:
-	for hdr in $(INST_HEADERS); do \
-		rm -f $(DESTDIR)/usr/include/dahdi/$$hdr; \
-	done
-	-rmdir $(DESTDIR)/usr/include/dahdi
+	rm -rf $(DESTDIR)/usr/include/dahdi
 
 install-devices:
 ifndef DYNFS
@@ -170,7 +168,7 @@
 
 uninstall-devices:
 ifndef DYNFS
-	-rm -rf $(DESTDIR)/dev/dahdi
+	rm -rf $(DESTDIR)/dev/dahdi
 else # DYNFS
 	rm -f $(DESTDIR)/etc/udev/rules.d/dahdi.rules
 endif