Small fix

[lyx.git] / lib / Makefile.am

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 1f766798343ef71b380fc8f30f33a8bdd30136e2..d797771d58e057017a74210895f23e45f83987a9 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,80 +1,99 @@
 AUTOMAKE_OPTIONS = foreign
 DISTCLEANFILES = *.orig *.rej *~ *.bak core textclass.lst packages.lst \
-               lyxrc.defaults doc/LyXConfig.lyx
-MAINTAINERCLEANFILES = $(srcdir)/Makefile.in listerrors
+               lyxrc.defaults doc/LyXConfig.lyx doc/LaTeXConfig.lyx
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
 SUBDIRS = reLyX
-bin_SCRIPTS = listerrors
 
-M4=m4
 CHMOD=chmod
 
 BIND = bind/*.bind
 CLIPART = clipart/*.eps
 DOCDIST = doc/LyXConfig.lyx*
 DOCINST = doc/*.lyx doc/*.eps doc/*.lyx.in
-EXAMPLES = examples/*.lyx
-IMAGES = images/*.xpm
+EXAMPLES = examples/*.lyx examples/*.fen
+HELP = help/*.hlp
+IMAGES = images/*.xpm images/*.ppm images/math/*.xpm
 KBD = kbd/*.kmap kbd/*.cdef
-LAYOUT = layouts/*.layout layouts/*.inc 
-LYXSCRIPTS = configure configure.cmd scripts/*
+LAYOUT = layouts/*.layout layouts/*.inc
+LYXSCRIPTS = configure configure.cmd scripts/* lyx2lyx/*
 TEMPL = templates/*.lyx
-TEXSUPPORT = tex/*.cls
+TEXSUPPORT = tex/*.cls tex/*.sty
 UI = ui/*.ui
 
-configure: configure.m4
-       $(M4) $< > $@
-       $(CHMOD) 755 $@
- 
-LIBINSTFILES = $(BIND) $(CLIPART) $(DOCINST) $(EXAMPLES) $(IMAGES) $(KBD) \
-       $(LAYOUT) $(TEMPL) $(TEXSUPPORT) $(UI)
+LIBINSTFILES = $(BIND) $(CLIPART) $(DOCINST) $(EXAMPLES) $(HELP) $(IMAGES) \
+       $(KBD) $(LAYOUT) $(TEMPL) $(TEXSUPPORT) $(UI)
 
-LIBDISTFILES = $(BIND) $(CLIPART) $(DOCDIST) $(EXAMPLES) $(IMAGES) $(KBD) \
-       $(LAYOUT) $(TEMPL) $(UI) $(TEXSUPPORT) $(LYXSCRIPTS)
+LIBDISTFILES = $(BIND) $(CLIPART) $(DOCDIST) $(EXAMPLES) $(HELP) $(IMAGES) \
+       $(KBD) $(LAYOUT) $(TEMPL) $(UI) $(TEXSUPPORT) $(LYXSCRIPTS)
 
 pkgdata_DATA = lyxrc.example CREDITS chkconfig.ltx lyxrc.defaults \
-               textclass.lst packages.lst external_templates \
-               encodings languages
+              textclass.lst packages.lst external_templates \
+              encodings languages symbols
 
-LYXLIBDIRS = bind clipart doc examples images kbd layouts scripts \
-             templates tex ui
+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) build-listerrors \
-       encodings languages
+       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) $< > $@
+       $(CHMOD) 755 $@
+
+lyxrc.defaults: $(srcdir)/configure
+       $(SHELL) $<
 
 libinstalldirs:
        for dir in $(LYXLIBDIRS) ; do \
                $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/$$dir ; \
        done
 
-install-data-local: libinstalldirs
-       files=`cd ${srcdir} ; echo $(LIBINSTFILES)` ; \
+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 \
-          $(INSTALL_DATA) ${srcdir}/$$i $(DESTDIR)$(pkgdatadir)/$$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 ; \
+       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 \
+          $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(pkgdatadir)/$$i ; \
        done
 
 install-exec-local: libinstalldirs
-       files=`cd ${srcdir} ; echo $(LYXSCRIPTS)` ; \
+       files=`cd $(srcdir) ; echo $(LYXSCRIPTS)` ; \
        for i in $${files} ; do \
-          $(INSTALL_SCRIPT) ${srcdir}/$$i $(DESTDIR)$(pkgdatadir)/$$i ; \
+          $(INSTALL_SCRIPT) $(srcdir)/$$i $(DESTDIR)$(pkgdatadir)/$$i ; \
        done
 
-uninstall-local:
+uninstall-local: uninstall-xfonts
        @$(NORMAL_UNINSTALL)
-       files=`cd ${srcdir} ; echo $(LIBINSTFILES) $(LYXSCRIPTS)` ; \
+       files=`cd $(srcdir) ; echo $(LIBINSTFILES) $(LYXSCRIPTS)` ; \
        for i in $${files} ; do \
-          rm -f $(pkgdatadir)/$$i ; \
+          rm -f $(DESTDIR)$(pkgdatadir)/$$i ; \
        done ; \
-       dirs=`cd ${srcdir} ; echo $(LYXLIBDIRS)` ; \
+       dirs=`cd $(srcdir) ; echo $(LYXLIBDIRS)` ; \
        for i in $${dirs} ; do \
-          rm -rf $(pkgdatadir)/$$i ; \
+          rm -rf $(DESTDIR)$(pkgdatadir)/$$i ; \
        done
 
 dist-hook:
-       cd ${distdir} ; rm -rf `find . -name \*CVS\*` ; \
-       rm -rf doc/BUGS.lyx doc/.cvsignore; \
+       cd $(distdir) ; rm -rf `find . -name \*CVS\*` ; \
+       rm -rf doc/.cvsignore; \
        [ -f doc/UserGuide.lyx ] || { cvs -Q export -r HEAD -d doc lyxdoc || \
          echo "WARNING: Unable to get LyX Documentation from CVS!" ; true ; }
-
-listerrors: examples/Literate.lyx
-       ${srcdir}/build-listerrors ${srcdir}