Attachment #286257 for bug #155974

View | Details | Raw Unified | Return to bug 155974 | Differences between

and this patch

Lines 41-49 Link Here

(-)KERNEL_SRC_6.3.1.old/doc/docutils/Makefile.am (-2 / +2 lines)
41	PAPEROPT_a4 = -D latex_paper_size=a4	41	PAPEROPT_a4 = -D latex_paper_size=a4
42	ALLSPHINXOPTS = -d doctrees $(PAPEROPT_a4) $(SPHINXOPTS) $(SOURCEDIR)	42	ALLSPHINXOPTS = -d doctrees $(PAPEROPT_a4) $(SPHINXOPTS) $(SOURCEDIR)
43		43
44	SPHINX_PYTHONPATH = $(prefix)/lib/python$(PYTHON_VERSION)/site-packages/salome:$(prefix)/lib64/python$(PYTHON_VERSION)/site-packages/salome:$(prefix)/bin/salome:$(OMNIORB_ROOT)/lib/python$(PYTHON_VERSION)/site-packages:$(OMNIORB_ROOT)/lib64/python$(PYTHON_VERSION)/site-packages	44	SPHINX_PYTHONPATH = $(DESTDIR)/$(prefix)/lib/python$(PYTHON_VERSION)/site-packages/salome:$(DESTDIR)/$(prefix)/lib64/python$(PYTHON_VERSION)/site-packages/salome:$(DESTDIR)/$(prefix)/bin/salome:$(OMNIORB_ROOT)/lib/python$(PYTHON_VERSION)/site-packages:$(OMNIORB_ROOT)/lib64/python$(PYTHON_VERSION)/site-packages
45		45
46	SPHINX_LD_LIBRARY_PATH = $(OMNIORB_ROOT)/lib	46	SPHINX_LD_LIBRARY_PATH = $(OMNIORB_ROOT)/lib:$(DESTDIR)/$(prefix)/lib/salome:$(DESTDIR)/$(prefix)/lib64/salome
47		47
48		48
49	.PHONY: latex	49	.PHONY: latex

Lines 78-85 Link Here

(-)KERNEL_SRC_6.3.1.old/doc/docutils/Makefile.am (-2 / +2 lines)
78	install-data-local: html/index.html	78	install-data-local: html/index.html
79	test -z $(pydocdir) \|\| mkdir -p $(DESTDIR)$(pydocdir)	79	test -z $(pydocdir) \|\| mkdir -p $(DESTDIR)$(pydocdir)
80	if test -d "html"; then b=; else b="$(srcdir)/"; fi; \	80	if test -d "html"; then b=; else b="$(srcdir)/"; fi; \
81	cp -rf $$b"html"/* $(pydocdir) ; \	81	cp -rf $$b"html"/* $(DESTDIR)$(pydocdir) ; \
82	if test -f $$b"latex"/kernelpy.pdf; then cp -f $$b"latex"/kernelpy.pdf $(pydocdir) ; fi;	82	if test -f $$b"latex"/kernelpy.pdf; then cp -f $$b"latex"/kernelpy.pdf $(DESTDIR)$(pydocdir) ; fi;
83		83
84	uninstall-local:	84	uninstall-local:
85	-test -d $(pydocdir) && chmod -R +w $(pydocdir) && rm -rf $(pydocdir)/*	85	-test -d $(pydocdir) && chmod -R +w $(pydocdir) && rm -rf $(pydocdir)/*

Return to bug 155974