From 8f17de4c30ed099c328e625f379e71899bc068bd Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Thu, 19 Jun 2003 10:52:16 +0000
Subject: [PATCH] 2003-06-19  Tim Waugh  <twaugh@redhat.com>         *
 Makefile.am, doc/Makefile.am, doc/omf.make, doc/xmldocs.make:         Fixes
 so that 'make distcheck' succeeds.

svn: r1764
---
 gramps2/ChangeLog        | 2 ++
 gramps2/Makefile.am      | 2 ++
 gramps2/doc/Makefile.am  | 2 ++
 gramps2/doc/omf.make     | 6 ++++--
 gramps2/doc/xmldocs.make | 2 +-
 5 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 7696bca07..705ddc6c2 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,4 +1,6 @@
 2003-06-19  Tim Waugh  <twaugh@redhat.com>
+	* Makefile.am, doc/Makefile.am, doc/omf.make, doc/xmldocs.make:
+	Fixes so that 'make distcheck' succeeds.
 	* src/WriteXML.py (write_xml_data): Use a stable order for writing
 	elements in XML.  This makes it useful to do revision control (RFE
 	748165).
diff --git a/gramps2/Makefile.am b/gramps2/Makefile.am
index 7afda56cb..104a41271 100644
--- a/gramps2/Makefile.am
+++ b/gramps2/Makefile.am
@@ -18,3 +18,5 @@ pycheck:
 	(cd src; make pycheck) 
 trans:
 	(cd src; make trans) 
+
+CLEANFILES = gramps
diff --git a/gramps2/doc/Makefile.am b/gramps2/doc/Makefile.am
index 71528be9f..c4a0e0869 100644
--- a/gramps2/doc/Makefile.am
+++ b/gramps2/doc/Makefile.am
@@ -9,3 +9,5 @@ EXTRA_DIST = $(man_MANS) $(man_IN_FILES) xmldocs.make omf.make
 
 gramps.1: $(top_builddir)/config.status gramps.1.in
 	cd $(top_builddir) && CONFIG_FILES=doc/$@ $(SHELL) ./config.status
+
+CLEANFILES=$(man_MANS)
diff --git a/gramps2/doc/omf.make b/gramps2/doc/omf.make
index d6dfa82be..da2372a6d 100644
--- a/gramps2/doc/omf.make
+++ b/gramps2/doc/omf.make
@@ -33,14 +33,14 @@ omf: omf_timestamp
 
 omf_timestamp: $(omffile)
 	-for file in $(omffile); do \
-	  scrollkeeper-preinstall $(docdir)/$(docname).xml $(srcdir)/$$file $(srcdir)/$$file.out; \
+	  scrollkeeper-preinstall $(docdir)/$(docname).xml $(srcdir)/$$file $$file.out; \
 	done
 	touch omf_timestamp
 
 install-data-hook-omf:
 	$(mkinstalldirs) $(DESTDIR)$(omf_dest_dir)
 	for file in $(omffile); do \
-		$(INSTALL_DATA) $(srcdir)/$$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
+		$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
 	done
 	-scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
 
@@ -51,3 +51,5 @@ uninstall-local-omf:
 	done
 	-rmdir $(omf_dest_dir)
 	-scrollkeeper-update -p $(scrollkeeper_localstate_dir)
+
+CLEANFILES+=*.out
diff --git a/gramps2/doc/xmldocs.make b/gramps2/doc/xmldocs.make
index 784f3fb21..d1e348308 100644
--- a/gramps2/doc/xmldocs.make
+++ b/gramps2/doc/xmldocs.make
@@ -84,7 +84,7 @@ uninstall-local-doc:
 	-if test "$(figdir)"; then \
 	  for file in $(srcdir)/$(figdir)/*.png; do \
 	    basefile=`echo $$file | sed -e  's,^.*/,,'`; \
-	    rm -f $(docdir)/$(figdir)/$$basefile; \
+	    rm -f $(DESTDIR)/$(docdir)/$(figdir)/$$basefile; \
 	  done; \
 	  rmdir $(DESTDIR)$(docdir)/$(figdir); \
 	fi