summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Henstridge <james@jamesh.id.au>2004-10-06 07:04:51 +0000
committerJames Henstridge <jamesh@src.gnome.org>2004-10-06 07:04:51 +0000
commitf06e257f23fa990d2faa3c32a5825b2527f0faef (patch)
treede9d410878127251ec1e82ba26753bb26bf5af98
parentd084aa0d0204c65ae2e0a0ec17a86d554fa5da07 (diff)
downloadgnome-common-f06e257f23fa990d2faa3c32a5825b2527f0faef.tar.gz
use $(DESTDIR) in uninstall rule. This is needed to allow packages to
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. svn path=/trunk/; revision=3477
-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 14df1c3..07ced4c 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 2a2b9e7..cb7acba 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 \