From 1e8ff31ceece2389df538efefd2522f92cbbc111 Mon Sep 17 00:00:00 2001
From: Dave Page <dpage@pgadmin.org>
Date: Thu, 10 May 2012 14:42:16 +0100
Subject: [PATCH] Fix the clean/distclean build targets. Rename the 'doc'
 target to 'docs' - it's more obvious, and is consistent with the directory
 name.

---
 Makefile.am            | 5 ++++-
 xtra/png2c/Makefile.am | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 90e71aec09..3d625c2440 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -80,8 +80,11 @@ style:
 	astyle -n -p -b -S -t4 -k3 -z2 `find . -name "*.cpp" -o -name "*.h" | egrep -v "(wx-build|xrcDialogs|pgscript/test)"`
 
 # Create HTML docs
-doc:
+docs:
 if SPHINX_BUILD
 	cd $(top_srcdir)/docs/en_US && make -f Makefile.sphinx SPHINXBUILD=${SPHINX_BUILD} html
 endif
 
+clean-local:
+	rm -rf docs/en_US/_build
+	rm docs/en_US/conf.py
diff --git a/xtra/png2c/Makefile.am b/xtra/png2c/Makefile.am
index dba8dcae2b..6c6646c33b 100644
--- a/xtra/png2c/Makefile.am
+++ b/xtra/png2c/Makefile.am
@@ -14,3 +14,5 @@ png2c_SOURCES = \
 
 EXTRA_DIST = \
 	$(srcdir)/png2c.vcproj
+
+distclean: