#! /bin/sh /usr/share/dpatch/dpatch-run ## 87_move_documentation.dpatch by ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: place html documentation under hplip-doc/HTML/ @DPATCH@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' hplip-3.11.1~/Makefile.am hplip-3.11.1/Makefile.am --- hplip-3.11.1~/Makefile.am 2011-01-19 06:18:26.000000000 +0100 +++ hplip-3.11.1/Makefile.am 2011-01-23 23:57:36.905046314 +0100 @@ -23,11 +23,11 @@ if DOC_BUILD wwwsrc = doc -www0dir = $(docdir) +www0dir = $(hpdocdir)/HTML dist_www0_DATA = $(wwwsrc)/index.html $(wwwsrc)/commandline.html $(wwwsrc)/copying.html $(wwwsrc)/devicemanager.html $(wwwsrc)/faxtrouble.html $(wwwsrc)/gettinghelp.html $(wwwsrc)/hpscan.html $(wwwsrc)/mainttask.html $(wwwsrc)/plugins.html $(wwwsrc)/print.html $(wwwsrc)/printing.html $(wwwsrc)/printoptions.html $(wwwsrc)/printtroubleshooting.html $(wwwsrc)/scanning.html $(wwwsrc)/scantrouble.html $(wwwsrc)/sendfax.html $(wwwsrc)/setup.html $(wwwsrc)/systray.html $(wwwsrc)/troubleshooting.html $(wwwsrc)/uninstalling.html $(wwwsrc)/upgrading.html -www3dir = $(docdir)/styles +www3dir = $(www0dir)/styles dist_www3_DATA = $(wwwsrc)/styles/* -www4dir = $(docdir)/images +www4dir = $(www0dir)/images dist_www4_DATA = $(wwwsrc)/images/* endif