X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2FMakefile.am;h=4435b51dc9cbd8152140062af335f7654d013847;hb=be94e5691ab60655ec2f61a911fe62e60d9ebd78;hp=373cc65000293c5638b49b83e0c38dd05af76443;hpb=6c79118290d45c5d2b77441a3c5aa75afb001c06;p=lyx.git

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 373cc65000..4435b51dc9 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,8 +1,8 @@
 include $(top_srcdir)/config/common.am
 
-DISTCLEANFILES += textclass.lst packages.lst lyxrc.defaults
+DISTCLEANFILES += texput.log textclass.lst packages.lst lyxrc.defaults
 
-SUBDIRS = doc reLyX
+SUBDIRS = doc lyx2lyx
 
 EXTRA_DIST = \
 	configure.m4 \
@@ -10,11 +10,12 @@ EXTRA_DIST = \
 
 CHMOD = chmod
 
-dist_pkgdata_DATA = lyxrc.example CREDITS chkconfig.ltx lyxrc.defaults \
-	       textclass.lst packages.lst external_templates \
-	       encodings languages symbols
-
-dist_pkgdata_SCRIPTS = configure configure.cmd
+# We cannot use dist_pkgdata_SCRIPTS for configure, since a possible
+# version-suffix would get appended to the names. So we use dist_pkgdata_DATA
+# and chmod manually in install-data-hook.
+dist_pkgdata_DATA = lyxrc.example CREDITS chkconfig.ltx configure \
+	       lyxrc.defaults textclass.lst packages.lst external_templates \
+	       encodings languages symbols syntax.default
 
 binddir = $(pkgdatadir)/bind
 dist_bind_DATA = \
@@ -27,6 +28,7 @@ dist_bind_DATA = \
 	bind/greekkeys.bind \
 	bind/hollywood.bind \
 	bind/latinkeys.bind \
+	bind/mac.bind \
 	bind/math.bind \
 	bind/menus.bind \
 	bind/pt_menus.bind \
@@ -55,6 +57,10 @@ dist_examples_DATA = \
 	examples/currency.lyx \
 	examples/cv.lyx \
 	examples/da_splash.lyx \
+	examples/de_Lebenslauf.lyx \
+	examples/de_Minipage.lyx \
+	examples/de_TableExamples.lyx \
+	examples/de_Waehrungen.lyx \
 	examples/de_beispiel_gelyxt.lyx \
 	examples/de_beispiel_roh.lyx \
 	examples/de_splash.lyx \
@@ -598,8 +604,8 @@ dist_imagesmath_DATA = \
 	images/math/surd.xpm \
 	images/math/swarrow.xpm \
 	images/math/tau.xpm \
-	images/math/textrm_0.xpm \
-	images/math/textrm_A.xpm \
+	images/math/textrm_Oe.xpm \
+	images/math/textrm_AA.xpm \
 	images/math/therefore.xpm \
 	images/math/theta.xpm \
 	images/math/theta2.xpm \
@@ -746,6 +752,8 @@ dist_layouts_DATA =\
 	layouts/cv.layout \
 	layouts/db_lyxmacros.inc \
 	layouts/db_stdclass.inc \
+	layouts/db_stdcharstyles.inc \
+	layouts/db_stdcounters.inc \
 	layouts/db_stdlayouts.inc \
 	layouts/db_stdlists.inc \
 	layouts/db_stdsections.inc \
@@ -788,7 +796,6 @@ dist_layouts_DATA =\
 	layouts/mwart.layout \
 	layouts/mwbk.layout \
 	layouts/mwrep.layout \
-	layouts/obsolete.inc \
 	layouts/paper.layout \
 	layouts/report.layout \
 	layouts/revtex.layout \
@@ -798,7 +805,6 @@ dist_layouts_DATA =\
 	layouts/scrclass.inc \
 	layouts/scrlettr.layout \
 	layouts/scrlttr2.layout \
-	layouts/scrmacros.inc \
 	layouts/scrreprt.layout \
 	layouts/seminar.layout \
 	layouts/siamltex.layout \
@@ -831,33 +837,22 @@ dist_layouts_DATA =\
 	layouts/g-brief2.layout \
 	layouts/svglobal.layout
 
-lyx2lyxdir = $(pkgdatadir)/lyx2lyx
-dist_lyx2lyx_SCRIPTS = lyx2lyx/lyx2lyx
-dist_lyx2lyx_DATA = \
-	lyx2lyx/lyx2lyx \
-	lyx2lyx/parser_tools.py \
-	LyX.py \
-	lyx2lyx/lyx_0_12.py \
-	lyx2lyx/lyx_1_0_0.py \
-	lyx2lyx/lyx_1_0_1.py \
-	lyx2lyx/lyx_1_1_4.py \
-	lyx2lyx/lyx_1_1_5.py \
-	lyx2lyx/lyx_1_1_6.py \
-	lyx2lyx/lyx_1_1_6fix3.py \
-	lyx2lyx/lyx_1_2.py \
-	lyx2lyx/lyx_1_3.py \
-	lyx2lyx/lyx_1_4.py
-
 scriptsdir = $(pkgdatadir)/scripts
-dist_scripts_SCRIPTS = \
+# We cannot use dist_scripts_SCRIPTS, since a possible version-suffix would
+# get appended to the names. So we use dist_scripts_DATA and chmod manually
+# in install-data-hook.
+dist_scripts_DATA = \
 	scripts/TeXFiles.sh \
 	scripts/convertDefault.sh \
 	scripts/fen2ascii.py \
 	scripts/fig2pdftex.sh \
 	scripts/fig2pstex.sh \
-	scripts/listerrors \
+	scripts/fig_copy.sh \
 	scripts/legacy_lyxpreview2ppm.py \
-	scripts/lyxpreview2bitmap.py
+	scripts/listerrors \
+	scripts/lyxpreview2bitmap.py \
+	scripts/lyxpreview_tools.py \
+	scripts/tex_copy.py
 
 templatesdir = $(pkgdatadir)/templates
 dist_templates_DATA = \
@@ -905,26 +900,8 @@ $(srcdir)/configure: $(srcdir)/configure.m4
 lyxrc.defaults: $(srcdir)/configure
 	$(SHELL) $<
 
-install-xfonts:
-	test -f xfonts/fonts.dir || exit 0 ; \
-	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/xfonts ; \
-	files=`sed -e 's/^[0-9]*$$//' -e 's/^\([^ ]*\) .*$$/\1/' xfonts/fonts.dir` ; \
-	for i in $${files} ; do \
-	  ln -f -s `kpsewhich $$i` $(DESTDIR)$(pkgdatadir)/xfonts/$$i ; \
-	done ; \
-	$(INSTALL_DATA) xfonts/fonts.dir $(DESTDIR)$(pkgdatadir)/xfonts/fonts.dir ; \
-	$(INSTALL_DATA) xfonts/fonts.scale $(DESTDIR)$(pkgdatadir)/xfonts/fonts.scale ; \
-	if test -f xfonts/PSres.upr ; then \
-	  $(INSTALL_DATA) xfonts/PSres.upr $(DESTDIR)$(pkgdatadir)/xfonts/PSres.upr ; \
-	fi
-
-uninstall-xfonts:
-	rm -rf $(DESTDIR)$(pkgdatadir)/xfonts
-
-distclean-local:
-	rm -rf xfonts
-
-install-data-local: install-xfonts
-
-
-uninstall-local: uninstall-xfonts
+install-data-hook:
+	$(CHMOD) 755 $(DESTDIR)$(pkgdatadir)/configure
+	for i in $(dist_scripts_DATA); do \
+		$(CHMOD) 755 $(DESTDIR)$(pkgdatadir)/$$i; \
+	done