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

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).

Makefile.am

@@ -18,3 +18,5 @@ pycheck:
 	(cd src; make pycheck) 
 trans:
 	(cd src; make trans) 
+
+CLEANFILES = gramps

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)

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

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