summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--doc-build/omf.make8
2 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 14df1c35..07ced4c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-10-06 James Henstridge <james@jamesh.id.au>
+
+ * doc-build/omf.make (uninstall-local-omf): use $(DESTDIR) in
+ uninstall rule. This is needed to allow packages to distcheck
+ with newer versions of automake.
+
2004-09-14 James Henstridge <james@jamesh.id.au>
* configure.in: bump version number to 2.8.0
diff --git a/doc-build/omf.make b/doc-build/omf.make
index 2a2b9e7d..cb7acbaa 100644
--- a/doc-build/omf.make
+++ b/doc-build/omf.make
@@ -45,15 +45,15 @@ install-data-hook-omf:
for file in $(omffile); do \
$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
done
- -scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
+ -scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
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 $(DESTDIR)$(scrollkeeper_localstate_dir)
clean-local-omf:
-for file in $(omffile); do \