Cmake export tests: Really supply own system fonts only if not specified in document.

[lyx.git] / lib / doc / Makefile.am

diff --git a/lib/doc/Makefile.am b/lib/doc/Makefile.am
index 79c448ae29eb305460b9050cf00e4a1a3637ffe4..f26e9f5acde1eea09f810d32e873cc35c422b504 100644 (file)
--- a/lib/doc/Makefile.am
+++ b/lib/doc/Makefile.am
@@ -185,8 +185,7 @@ iddocdir = $(docdir)/id
 dist_iddoc_DATA = \
        id/Intro.lyx \
        id/Shortcuts.lyx \
-       id/Tutorial.lyx \
-       id/UserGuide.lyx
+       id/Tutorial.lyx
 
 idclipartdocdir = $(iddocdir)/clipart
 dist_idclipartdoc_DATA = \
@@ -221,11 +220,17 @@ dist_jadoc_DATA = \
 
 jaclipartdocdir = $(jadocdir)/clipart
 dist_jaclipartdoc_DATA = \
+       ja/clipart/BoxInsetDefaultQt4.png \
        ja/clipart/ChildDocumentQt4.png \
+       ja/clipart/CommentNoteImageQt4.png \
        ja/clipart/ERT.png \
        ja/clipart/ExternalMaterialQt4.png \
        ja/clipart/floatQt4.png \
        ja/clipart/footnoteQt4.png \
+       ja/clipart/GreyedOutNoteImageQt4.png \
+       ja/clipart/labelQt4.png \
+       ja/clipart/LyXNoteImageQt4.png \
+       ja/clipart/macrobox.png \
        ja/clipart/referenceQt4.png \
        ja/clipart/StandardToolbar.png \
        ja/clipart/ToolbarEnvBox.png
@@ -316,9 +321,11 @@ doc_files = \
 install-data-hook:
        for i in $(doc_files); \
        do \
-               if $(EGREP) -q "LYX_DIR_VER|LYX_USERDIR_VER" "$(DESTDIR)$(docdir)/$$i"; then \
+               if $(EGREP) -q "LYX_DIR_VER|LYX_USERDIR_VER|^\\\\origin " "$(DESTDIR)$(docdir)/$$i"; then \
+                       origin=`dirname "/systemlyxdir/doc/$$i"`/; \
                        sed -e "s/LYX_DIR_VER/$(LYX_DIR_VER)/g" \
                            -e "s/LYX_USERDIR_VER/$(LYX_USERDIR_VER)/g" \
+                           -e "s|^\\\\origin .*|\\\\origin $$origin|" \
                                "$(DESTDIR)$(docdir)/$$i" > "$(DESTDIR)$(docdir)/$$i.tmp"; \
                        mv -f "$(DESTDIR)$(docdir)/$$i.tmp" "$(DESTDIR)$(docdir)/$$i"; \
                        chmod 644 "$(DESTDIR)$(docdir)/$$i"; \