ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-11-15 10:08:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

0021196: [CEA 456] Integration and merge modification for debian packages

Browse Source 
roll back kernel-install-without-docs.patch
This commit is contained in:
eap 2011-03-03 16:19:45 +00:00
parent 8ab5789e4a
commit c22f737856
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/Makefile.am
View File

@ -26,10 +26,8 @@ SUBDIRS = salome docutils
usr_docs: usr_docs:
(cd salome && $(MAKE) $(AM_MAKEFLAGS) usr_docs) (cd salome && $(MAKE) $(AM_MAKEFLAGS) usr_docs)
(cd docutils && $(MAKE) $(AM_MAKEFLAGS) usr_docs)
docs: usr_docs docs: usr_docs
dev_docs: dev_docs:
(cd salome && $(MAKE) $(AM_MAKEFLAGS) dev_docs)
(cd docutils && $(MAKE) $(AM_MAKEFLAGS) dev_docs) (cd docutils && $(MAKE) $(AM_MAKEFLAGS) dev_docs)

4
doc/docutils/Makefile.am
View File

@ -31,8 +31,6 @@ if SPHINX_IS_OK
html/index.html:$(RSTFILES) html/index.html:$(RSTFILES)
make htm make htm
usr_docs: html/index.html
endif endif
EXTRA_DIST+= images EXTRA_DIST+= images
@ -75,7 +73,7 @@ RSTFILES= \
EXTRA_DIST+= $(RSTFILES) EXTRA_DIST+= $(RSTFILES)
install-data-local: install-data-local: html/index.html
test -z $(pydocdir) || mkdir -p $(DESTDIR)$(pydocdir) test -z $(pydocdir) || mkdir -p $(DESTDIR)$(pydocdir)
if test -d "html"; then b=; else b="$(srcdir)/"; fi; \ if test -d "html"; then b=; else b="$(srcdir)/"; fi; \
cp -rf $$b"html"/* $(pydocdir) ; \ cp -rf $$b"html"/* $(pydocdir) ; \

2
doc/salome/gui/GEOM/Makefile.am
View File

@ -61,7 +61,7 @@ clean-local:
esac ; \ esac ; \
done ; done ;
install-data-local: install-data-local: usr_docs
@if [ -e main.html ]; then \ @if [ -e main.html ]; then \
$(INSTALL) -d $(DESTDIR)$(docdir)/gui/GEOM ; \ $(INSTALL) -d $(DESTDIR)$(docdir)/gui/GEOM ; \
for filen in `find . -maxdepth 1` ; do \ for filen in `find . -maxdepth 1` ; do \