Update the Doxygen jquery removal code to be conditional

* Reapply the removal of the Doxygen-generated copy of jquery, since
  this apparently wasn't as fixed as had been advertised.  However, make
  it conditional on the existence of the jquery.js script, so we should
  hopefully only fix this where necessary.

diff --git a/debian/changelog b/debian/changelog
index 506c164c05b55f964408d8ecd5b9400d302a6e71..cba0cbfdaca6c186fdce356d41a0eb248dc544f9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,10 @@ openafs (1.6.0~pre7-1) UNRELEASED; urgency=low
     - Treat Linux 3.0 as Linux 2.6 for sysname purposes
   * Update README.source for a few changes in procedures and source
     package format.
+  * Reapply the removal of the Doxygen-generated copy of jquery, since
+    this apparently wasn't as fixed as had been advertised.  However, make
+    it conditional on the existence of the jquery.js script, so we should
+    hopefully only fix this where necessary.
 
  -- Russ Allbery <rra@debian.org>  Mon, 18 Jul 2011 16:48:35 -0700
 

diff --git a/debian/rules b/debian/rules
index 5232c05abd2c70bddb1031ba59a37cf019703e36..5ba163b83437ade375906ca4edc8cba681c25363 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -232,9 +232,11 @@ override_dh_installdocs:
        set -e; if [ -d "$(DOCS)" ] ; then \
            for d in arch-overview bos-spec fs-cm-spec rx-spec \
                     vldb-vol-spec ; do \
-               rm $(DOCS)/html/$$d/jquery.js ; \
-               ln -s /usr/share/javascript/jquery/jquery.min.js \
-                   $(DOCS)/html/$$d/jquery.js ; \
+               if [ -f "$(DOCS)/html/$$d/jquery.js" ] ; then \
+                   rm $(DOCS)/html/$$d/jquery.js ; \
+                   ln -s /usr/share/javascript/jquery/jquery.min.js \
+                       $(DOCS)/html/$$d/jquery.js ; \
+               fi ; \
            done ; \
        fi