Bug#471868: Broken install-data-local target in makefile templates

[J.H.M. Dassen (Ray)]

Package: gtk-doc-tools
Version: 1.10-1
Severity: important
Tags: patch upstream

The logic in the makefile templates in this version is broken: when
gtkdoc-rebase is not available, the install-data-local target will error out
rather than handle this case silently; see
	http://bugzilla.gnome.org/show_bug.cgi?id=506506#c2

To fix, replace foo && bar by if foo; then bar; fi:

diff -ru gtk-doc-1.10.old/gtk-doc.make gtk-doc-1.10/gtk-doc.make
--- gtk-doc-1.10.old/gtk-doc.make	2008-03-10 20:07:52.000000000 +0100
+++ gtk-doc-1.10/gtk-doc.make	2008-03-20 20:28:10.000000000 +0100
@@ -139,8 +139,9 @@
 	  done; \
 	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
 	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \
-	  which gtkdoc-rebase >/dev/null && \
+	  if which gtkdoc-rebase >/dev/null ; then \
 	    gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \
+	  fi ; \
 	fi
 	
 
diff -ru gtk-doc-1.10.old/gtk-doc.notmpl.make gtk-doc-1.10/gtk-doc.notmpl.make
--- gtk-doc-1.10.old/gtk-doc.notmpl.make	2008-03-10 20:07:52.000000000 +0100
+++ gtk-doc-1.10/gtk-doc.notmpl.make	2008-03-20 20:28:31.000000000 +0100
@@ -124,8 +124,9 @@
 	  done; \
 	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
 	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \
-	  which gtkdoc-rebase >/dev/null && \
+	  if which gtkdoc-rebase >/dev/null ; then \
 	    gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \
+	  fi ; \
 	fi
 
 uninstall-local:

-- System Information:
Debian Release: lenny/sid
  APT prefers unstable
  APT policy: (990, 'unstable'), (500, 'testing-proposed-updates'), (500, 'stable'), (400, 'testing')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.24.3 (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages gtk-doc-tools depends on:
ii  docbook-dsssl            1.79-5          modular DocBook DSSSL stylesheets,
ii  docbook-to-man           1:2.0.0-26      converter from DocBook SGML into r
ii  docbook-xml              4.5-5           standard XML documentation system,
ii  docbook-xsl              1.73.2.dfsg.1-3 stylesheets for processing DocBook
ii  gnome-common             2.20.0-1        common scripts and macros to devel
ii  jade                     1.2.1-47        James Clark's DSSSL Engine
ii  perl                     5.8.8-12        Larry Wall's Practical Extraction 
ii  python                   2.4.4-6         An interactive high-level object-o
ii  xsltproc                 1.1.22-1        XSLT command line processor

Versions of packages gtk-doc-tools recommends:
ii  pkg-config                    0.22-1     manage compile and link flags for 

-- no debconf information