X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2FMakefile.am;h=63ebfba16ab9e5d9f072ac64489ab41089e5a9a8;hb=669acb47c58e1e573d77518c75dbb673af877085;hp=e5d45579e65f786f7300ce5cead63bb7935303ad;hpb=1d266c8cfa06d15967dbbe4b186eb72d323cb1d4;p=lyx.git

diff --git a/lib/Makefile.am b/lib/Makefile.am
index e5d45579e6..63ebfba16a 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -12,7 +12,7 @@ dist_pkgdata_DATA = CREDITS autocorrect chkconfig.ltx external_templates \
 
 # We use DATA now instead of PYTHON because automake 1.11.2 complains.
 # Note that we "chmod 755" manually this file in install-data-hook.
-dist_pkgdata_DATA += configure.py 
+dist_pkgdata_DATA += configure.py
 
 dist_noinst_DATA = \
 	appdata.xml \
@@ -94,6 +94,7 @@ dist_deexamples_DATA = \
 	examples/de/Lebenslauf.lyx \
 	examples/de/linguistics.lyx \
 	examples/de/MultilingualCaptions.lyx \
+	examples/de/PDF-comment.lyx \
 	examples/de/serienbrief1.lyx \
 	examples/de/serienbrief2.lyx \
 	examples/de/serienbrief3.lyx \
@@ -139,6 +140,7 @@ dist_frexamples_DATA = \
 	examples/fr/linguistics.lyx \
 	examples/fr/ListesPuces.lyx \
 	examples/fr/MultilingualCaptions.lyx \
+	examples/fr/PDF-comment.lyx \
 	examples/fr/seminar.lyx \
 	examples/fr/simplecv.lyx \
 	examples/fr/splash.lyx \
@@ -259,7 +261,7 @@ dist_springerexamples_DATA = \
 	examples/springer/svmult_part.lyx \
 	examples/springer/svmult_preface.lyx \
 	examples/springer/svmult_referenc.lyx
-	
+
 thesisexamplesdir = $(pkgdatadir)/examples/thesis
 dist_thesisexamples_DATA = \
 	examples/thesis/Acknowledgments.lyx \
@@ -307,12 +309,14 @@ dist_examples_DATA = \
 	examples/biblioExample.bib \
 	examples/chess-article.lyx \
 	examples/chessgame.lyx \
+	examples/colored-boxes.lyx \
 	examples/docbook_article.lyx \
 	examples/europeCV.lyx \
 	examples/europassCV.lyx \
 	examples/example_lyxified.lyx \
 	examples/example_raw.lyx \
 	examples/FeynmanDiagrams.lyx \
+	examples/H-P-statements.lyx \
 	examples/iecc05.fen \
 	examples/iecc07.fen \
 	examples/iecc12.fen \
@@ -346,6 +350,7 @@ dist_examples_DATA = \
 	examples/sweave.lyx \
 	examples/tufte-book.lyx \
 	examples/tufte-handout.lyx \
+	examples/varwidth-floats-side-by-side.lyx \
 	examples/xyfigure.lyx \
 	examples/xyfigure.png \
 	examples/xypic.lyx
@@ -455,6 +460,7 @@ dist_images_DATA1X = \
 	images/href-insert.png \
 	images/hidetab.png \
 	images/index-insert.png \
+	images/info-insert.png \
 	images/info-insert_buffer_vcs-revision.png \
 	images/label-insert.png \
 	images/layout.png \
@@ -498,6 +504,11 @@ dist_images_DATA1X = \
 	images/reload.png \
 	images/script-insert_subscript.png \
 	images/script-insert_superscript.png \
+	images/specialchar-insert_latex.png \
+	images/specialchar-insert_latex2e.png \
+	images/specialchar-insert_lyx.png \
+	images/specialchar-insert_menu-separator.png \
+	images/specialchar-insert_tex.png \
 	images/spelling-continuously.png \
 	images/view-split_horizontal.png \
 	images/view-split_vertical.png \
@@ -1913,7 +1924,7 @@ dist_imagesclassic_DATA = \
 	images/classic/view-others.png
 
 imagescommandsdir = $(imagesdir)/commands
-dist_imagescommands_DATA = 
+dist_imagescommands_DATA =
 
 kbddir = $(pkgdatadir)/kbd
 dist_kbd_DATA = \
@@ -1995,6 +2006,7 @@ dist_layouts_DATA =\
 	layouts/book.layout \
 	layouts/braille.module \
 	layouts/broadway.layout \
+	layouts/changebars.module \
 	layouts/chess.layout \
 	layouts/cl2emult.layout \
 	layouts/ctex-article.layout \
@@ -2046,6 +2058,7 @@ dist_layouts_DATA =\
 	layouts/heb-article.layout \
 	layouts/heb-letter.layout \
 	layouts/hollywood.layout \
+	layouts/hpstatement.module \
 	layouts/IEEEtran.layout \
 	layouts/IEEEtran-CompSoc.layout \
 	layouts/IEEEtran-TransMag.layout \
@@ -2054,6 +2067,7 @@ dist_layouts_DATA =\
 	layouts/initials.module \
 	layouts/iopart.layout \
 	layouts/isprs.layout \
+	layouts/iucr.layout \
 	layouts/jarticle.layout \
 	layouts/jasatex.layout \
 	layouts/jbook.layout \
@@ -2089,6 +2103,7 @@ dist_layouts_DATA =\
 	layouts/numreport.inc \
 	layouts/numrevtex.inc \
 	layouts/paper.layout \
+	layouts/paralist.module \
 	layouts/pdfcomment.module \
 	layouts/pdfform.module \
 	layouts/powerdot.layout \
@@ -2172,7 +2187,8 @@ dist_layouts_DATA =\
 	layouts/todonotes.module \
 	layouts/treport.layout \
 	layouts/tufte-book.layout \
-	layouts/tufte-handout.layout
+	layouts/tufte-handout.layout \
+	layouts/varwidth.module
 
 scriptsdir = $(pkgdatadir)/scripts
 dist_scripts_DATA = \
@@ -2240,6 +2256,7 @@ dist_templates_DATA = \
 	templates/IJMPC.lyx \
 	templates/IJMPD.lyx \
 	templates/IOP-article.lyx \
+	templates/IUCr-article.lyx \
 	templates/ja_beamer-conference-ornate-20min.lyx \
 	templates/JASA.lyx \
 	templates/JSS-article.lyx \
@@ -2303,16 +2320,57 @@ lyx@program_suffix@.desktop: lyx.desktop-temp
 desktopdir = $(datadir)/applications
 desktop_DATA = lyx@program_suffix@.desktop
 
-CLEANFILES += lyx@program_suffix@.desktop lyx.desktop-temp \
-              lyx@program_suffix@.svg lyx@program_suffix@.png
+CLEANFILES = lyx@program_suffix@.desktop lyx.desktop-temp \
+             lyx@program_suffix@.svg lyx@program_suffix@.png
 endif
 dist_noinst_DATA += lyx.desktop.in images/lyx.svg images/lyx.png
 
+exampleandtemplate_files = \
+			   $(dist_caexamples_DATA) \
+			   $(dist_csexamples_DATA) \
+			   $(dist_daexamples_DATA) \
+			   $(dist_deexamples_DATA) \
+			   $(dist_elexamples_DATA) \
+			   $(dist_esexamples_DATA) \
+			   $(dist_euexamples_DATA) \
+			   $(dist_faexamples_DATA) \
+			   $(dist_frexamples_DATA) \
+			   $(dist_glexamples_DATA) \
+			   $(dist_heexamples_DATA) \
+			   $(dist_huexamples_DATA) \
+			   $(dist_idexamples_DATA) \
+			   $(dist_itexamples_DATA) \
+			   $(dist_jaexamples_DATA) \
+			   $(dist_koexamples_DATA) \
+			   $(dist_nlexamples_DATA) \
+			   $(dist_plexamples_DATA) \
+			   $(dist_ptexamples_DATA) \
+			   $(dist_roexamples_DATA) \
+			   $(dist_ruexamples_DATA) \
+			   $(dist_slexamples_DATA) \
+			   $(dist_skexamples_DATA) \
+			   $(dist_srexamples_DATA) \
+			   $(dist_svexamples_DATA) \
+			   $(dist_springerexamples_DATA) \
+			   $(dist_thesisexamples_DATA) \
+			   $(dist_ukexamples_DATA) \
+			   $(dist_examples_DATA) \
+			   $(dist_templates_DATA)
+
 install-data-hook:
 	$(CHMOD) 755 $(DESTDIR)$(pkgdatadir)/configure.py
 	for i in $(DESTDIR)$(scriptsdir)/*.py $(DESTDIR)$(scriptsdir)/listerrors ; do \
 		$(CHMOD) 755 $$i; \
 	done
+	for i in $(exampleandtemplate_files); do \
+		if $(EGREP) -q "^\\\\origin " "$(DESTDIR)$(pkgdatadir)/$$i"; then \
+			origin=`dirname "/systemlyxdir/$$i"`/; \
+			sed -e "s|^\\\\origin .*|\\\\origin $$origin|" \
+				"$(DESTDIR)$(pkgdatadir)/$$i" > "$(DESTDIR)$(pkgdatadir)/$$i.tmp"; \
+			mv -f "$(DESTDIR)$(pkgdatadir)/$$i.tmp" "$(DESTDIR)$(pkgdatadir)/$$i"; \
+			chmod 644 "$(DESTDIR)$(pkgdatadir)/$$i"; \
+		fi; \
+	done
 
 alltests: check alltests-recursive