X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2FMakefile.am;h=d797771d58e057017a74210895f23e45f83987a9;hb=5a8d168db41c73c011f750e0712993bec7a17edc;hp=984aa2869a26a107d67276c777d43dfced41dad3;hpb=f79c6a1991d1743ee1bf31f769bd57fb295241af;p=lyx.git

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 984aa2869a..d797771d58 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = foreign
 DISTCLEANFILES = *.orig *.rej *~ *.bak core textclass.lst packages.lst \
-		lyxrc.defaults doc/LyXConfig.lyx doc/LaTeXConfig.lyx -r xfonts
+		lyxrc.defaults doc/LyXConfig.lyx doc/LaTeXConfig.lyx
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
 SUBDIRS = reLyX
 
@@ -12,10 +12,10 @@ DOCDIST = doc/LyXConfig.lyx*
 DOCINST = doc/*.lyx doc/*.eps doc/*.lyx.in
 EXAMPLES = examples/*.lyx examples/*.fen
 HELP = help/*.hlp
-IMAGES = images/*.xpm
+IMAGES = images/*.xpm images/*.ppm images/math/*.xpm
 KBD = kbd/*.kmap kbd/*.cdef
 LAYOUT = layouts/*.layout layouts/*.inc
-LYXSCRIPTS = configure configure.cmd scripts/*
+LYXSCRIPTS = configure configure.cmd scripts/* lyx2lyx/*
 TEMPL = templates/*.lyx
 TEXSUPPORT = tex/*.cls tex/*.sty
 UI = ui/*.ui
@@ -30,12 +30,13 @@ pkgdata_DATA = lyxrc.example CREDITS chkconfig.ltx lyxrc.defaults \
 	       textclass.lst packages.lst external_templates \
 	       encodings languages symbols
 
-LYXLIBDIRS = bind clipart doc examples help images kbd layouts scripts \
+LYXLIBDIRS = bind clipart doc examples help images images/math kbd layouts lyx2lyx scripts \
 	     templates tex ui
 
 EXTRA_DIST = CREDITS chkconfig.ltx configure.cmd lyxrc.example \
-	external_templates $(LYXLIBDIRS) \
-	encodings languages symbols configure configure.m4
+	external_templates bind clipart doc examples help images \
+	kbd layouts lyx2lyx scripts templates tex ui encodings \
+	languages symbols configure configure.m4
 
 $(srcdir)/configure: $(srcdir)/configure.m4
 	$(M4) $< > $@
@@ -54,14 +55,20 @@ install-xfonts:
 	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/xfonts ; \
 	files=`sed -e 's/^[0-9]*$$//' -e 's/^\([^ ]*\) .*$$/\1/' xfonts/fonts.dir` ; \
 	for i in $${files} ; do \
-	  ln -sf `kpsewhich $$i` $(DESTDIR)$(pkgdatadir)/xfonts/$$i ; \
+	  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
+	$(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: libinstalldirs install-xfonts
 	files=`cd $(srcdir) ; echo $(LIBINSTFILES)` ; \
 	for i in $${files} ; do \