Small fix

[lyx.git] / lib / Makefile.am

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 7ca34e88c2182b16eb9b632e1e195cddb561085e..d797771d58e057017a74210895f23e45f83987a9 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -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/math/*.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 images/math 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,10 +55,13 @@ 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