From d3d1b4ea2be0f48b48b411f43627ec04cfd58cc1 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Wed, 10 Dec 2003 10:01:44 +0000 Subject: [PATCH] 2003-12-10 Tim Waugh * doc/omf.make: Fixed DESTDIR support. svn: r2495 --- ChangeLog | 3 +++ doc/omf.make | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index af8bacf74..f5f0ef812 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2003-12-10 Tim Waugh + * doc/omf.make: Fixed DESTDIR support. + 2003-12-09 Don Allingham * src/FamilyView.py (FamilyView.new_child_after_edit): call display_marriage instead of load_family. Prevents the diff --git a/doc/omf.make b/doc/omf.make index da2372a6d..2f2224801 100644 --- a/doc/omf.make +++ b/doc/omf.make @@ -47,9 +47,9 @@ install-data-hook-omf: uninstall-local-omf: -for file in $(srcdir)/*.omf; do \ basefile=`basename $$file`; \ - rm -f $(omf_dest_dir)/$$basefile; \ + rm -f $(DESTDIR)$(omf_dest_dir)/$$basefile; \ done - -rmdir $(omf_dest_dir) - -scrollkeeper-update -p $(scrollkeeper_localstate_dir) + -rmdir $(DESTDIR)$(omf_dest_dir) + -scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)/$(omf_dest_dir) CLEANFILES+=*.out