From 3287e69d3a9db97199cb36600bb01ead815903b5 Mon Sep 17 00:00:00 2001
From: Don Allingham <don@gramps-project.org>
Date: Tue, 8 Jul 2003 00:43:46 +0000
Subject: [PATCH] update

svn: r1840
---
 ChangeLog                       | 7 +++++++
 Makefile.in                     | 3 +++
 doc/Makefile.in                 | 3 +++
 doc/gramps-manual/C/Makefile.in | 9 +++++----
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f29fdcf05..8eea55c33 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-07-07  Don Allingham  <dallingham@users.sourceforge.net>
+	* src/plugins/DetAncestralReport.py: add import of string
+	* src/plugins/DetDescendantReport.py: add import of string
+	* src/Date.py: compare date modes when comparing dates
+	* src/EditPerson.py: save date strings which comparing for changes
+	* src/FamilyView.py: Scope Person.male properly
+
 2003-07-07  Alex Roitman  <shura@alex.neuro.umn.edu>
 	* src/plugins/DetDescendantReport.py: Enable book functionality.
 	Fix styles in book. Switch to tuple of options. 
diff --git a/Makefile.in b/Makefile.in
index f7f10f6ec..22dd673f3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -115,6 +115,8 @@ SUBDIRS = src doc example
 EXTRA_DIST = autogen.sh gramps.spec.in COPYING-DOCS
 
 bin_SCRIPTS = gramps
+
+CLEANFILES = gramps
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -401,6 +403,7 @@ install-strip:
 mostlyclean-generic:
 
 clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
 	-rm -f Makefile $(CONFIG_CLEAN_FILES)
diff --git a/doc/Makefile.in b/doc/Makefile.in
index fbcbd7b07..e3ff9fd32 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -116,6 +116,8 @@ man_IN_FILES = gramps.1.in
 man_MANS = $(man_IN_FILES:.1.in=.1)
 
 EXTRA_DIST = $(man_MANS) $(man_IN_FILES) xmldocs.make omf.make
+
+CLEANFILES = $(man_MANS)
 subdir = doc
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES =
@@ -341,6 +343,7 @@ install-strip:
 mostlyclean-generic:
 
 clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
 	-rm -f Makefile $(CONFIG_CLEAN_FILES)
diff --git a/doc/gramps-manual/C/Makefile.in b/doc/gramps-manual/C/Makefile.in
index 2d4362859..905ef9ed1 100644
--- a/doc/gramps-manual/C/Makefile.in
+++ b/doc/gramps-manual/C/Makefile.in
@@ -185,7 +185,8 @@ xml_files = $(entities) $(docname).xml
 omf_dir = $(top_srcdir)/omf-install
 
 EXTRA_DIST = $(xml_files) $(omffile)
-CLEANFILES = omf_timestamp
+
+CLEANFILES = omf_timestamp *.out
 
 omf_dest_dir = $(datadir)/omf/@PACKAGE@
 scrollkeeper_localstate_dir = $(localstatedir)/scrollkeeper
@@ -318,14 +319,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)
 
@@ -374,7 +375,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