[Kimchi-devel] [PATCH 1/2] bug fix: Package doc html files into deb package

[Sheldon]

comments below

On 02/18/2014 03:56 AM, Aline Manera wrote:
> From: Aline Manera <alinefm at br.ibm.com>
>
> To get the help html files dinamically the Makefile was using the
> following code:
>
> DITA_HTML_FILES = $(patsubst %.dita,%.html,$(wildcard *.dita))
> $(wildcard *.html)
>
> But it does not well while building deb packages as it cointans
> duplicated values:
>
>   /bin/mkdir -p '/tmp/tmp.86vGERYO70/usr/share/kimchi/ui/pages/help'
>   /usr/bin/install -c -m 644 guests.html storage.html templates.html
> guests.html index.html storage.html templates.html
> '/tmp/tmp.86vGERYO70/usr/share/kimchi/ui/pages/help'
> /usr/bin/install: will not overwrite just-created
> `/tmp/tmp.86vGERYO70/usr/share/kimchi/ui/pages/help/guests.html' with
> `guests.html'
> (...)
>
> So use $(if()) statement to get html files from one source or from
> another to avoid the errors above.
>
> Signed-off-by: Aline Manera <alinefm at br.ibm.com>
> ---
>   ui/pages/help/Makefile.am |    7 ++++---
>   1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/ui/pages/help/Makefile.am b/ui/pages/help/Makefile.am
> index 61ea209..81d7e90 100644
> --- a/ui/pages/help/Makefile.am
> +++ b/ui/pages/help/Makefile.am
> @@ -17,14 +17,15 @@
>   # License along with this library; if not, write to the Free Software
>   # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
>
> -DITA_HTML_FILES = $(patsubst %.dita,%.html,$(wildcard *.dita)) $(wildcard *.html)
> +DITA_HTML_FILES = $(patsubst %.dita,%.html,$(wildcard *.dita))
> +HTML_FILES = $(if $(wildcard *.html), $(wildcard *.html), $(DITA_HTML_FILES))
I have a try it can work without if on rpm package, but not try on deb 
package.
>   DITA_XSL_FILE = dita-help.xsl
miss EXTRA_DIST
The /EXTRA_DIST/ argument holds a list of all the files that are part of 
the
package, but are not installed by default and were not specified in any 
other way.

>
>   helpdir = $(datadir)/kimchi/ui/pages/help
>
> -dist_help_DATA = $(DITA_HTML_FILES) $(NULL)
> +dist_help_DATA = $(HTML_FILES) $(NULL)
>
>   %.html: %.dita $(DITA_XSL_FILE)
>   	xsltproc -o $@ $(DITA_XSL_FILE) $<
>
> -CLEANFILES = $(DITA_HTML_FILES)
> +CLEANFILES = $(HTML_FILES)


-- 
Thanks and best regards!

Sheldon Feng(???)<shaohef at linux.vnet.ibm.com>
IBM Linux Technology Center

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ovirt.org/pipermail/kimchi-devel/attachments/20140218/bbf769de/attachment.html>