- merged from DEVEL

Changed files:
    gnome-common-omf.patch -> 1.2

diff --git a/gnome-common-omf.patch b/gnome-common-omf.patch
index 8f5f8d738c486f5b599567c0343cf856ddf20494..2e156df70363fafe0d437156982b51961b21b2e8 100644 (file)
--- a/gnome-common-omf.patch
+++ b/gnome-common-omf.patch
@@ -5,15 +5,15 @@ diff -aurN gnome-common-2.8.0.orig/doc-build/omf.make gnome-common-2.8.0/doc-bui
        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 \
 @@ -53,7 +52,6 @@
-               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 \