fix typo in font list, add \hbar symbol

[lyx.git] / lib / Makefile.am

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 4510d24130b94b92675222f6c72f0becf54a9c16..939006f1918d44d2e128399ae0dd9e3ac3f4985e 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,10 +1,9 @@
 AUTOMAKE_OPTIONS = foreign
 DISTCLEANFILES = *.orig *.rej *~ *.bak core textclass.lst packages.lst \
-               lyxrc.defaults doc/LyXConfig.lyx
+               lyxrc.defaults doc/LyXConfig.lyx doc/LaTeXConfig.lyx
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
 SUBDIRS = reLyX
 
-M4=m4
 CHMOD=chmod
 
 BIND = bind/*.bind
@@ -32,7 +31,7 @@ pkgdata_DATA = lyxrc.example CREDITS chkconfig.ltx lyxrc.defaults \
               encodings languages symbols
 
 LYXLIBDIRS = bind clipart doc examples help images kbd layouts scripts \
-            templates tex ui xfonts
+            templates tex ui
 
 EXTRA_DIST = CREDITS chkconfig.ltx configure.cmd lyxrc.example \
        external_templates $(LYXLIBDIRS) \
@@ -52,13 +51,20 @@ libinstalldirs:
 
 install-xfonts:
        test -f xfonts/fonts.dir || exit 0 ; \
-       files=`sed -e 's/^[0-9]*$$//' -e 's/^\([^ ]*\) .*$$/\1/' xfonts/fonts.dir` ; echo [$$files] ;\
+       $(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 ; \
        done ; \
        $(INSTALL_DATA) xfonts/fonts.dir $(DESTDIR)$(pkgdatadir)/xfonts/fonts.dir ; \
        $(INSTALL_DATA) xfonts/fonts.scale $(DESTDIR)$(pkgdatadir)/xfonts/fonts.scale
 
+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 \
@@ -71,15 +77,15 @@ install-exec-local: libinstalldirs
           $(INSTALL_SCRIPT) $(srcdir)/$$i $(DESTDIR)$(pkgdatadir)/$$i ; \
        done
 
-uninstall-local:
+uninstall-local: uninstall-xfonts
        @$(NORMAL_UNINSTALL)
        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)` ; \
        for i in $${dirs} ; do \
-          rm -rf $(pkgdatadir)/$$i ; \
+          rm -rf $(DESTDIR)$(pkgdatadir)/$$i ; \
        done
 
 dist-hook: