X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2FMakefile.am;h=939006f1918d44d2e128399ae0dd9e3ac3f4985e;hb=8c7befa454d3842475039613b647f035035edee5;hp=a72ff9c144cc0e8c0e8b092bffd5dffe5ac38c93;hpb=c8089f8bf9d66c8428e8869895c61145ee4dd5e9;p=lyx.git

diff --git a/lib/Makefile.am b/lib/Makefile.am
index a72ff9c144..939006f191 100644
--- 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) \
@@ -51,34 +50,42 @@ libinstalldirs:
 	done
 
 install-xfonts:
-	files=`sed -e 's/^\([^ ]*\) .*$$/\1/' xfonts/fonts.dir` ; \
-	for i in $$(files) ; do \
+	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 -sf `kpsewhich $$i` $(DESTDIR)$(pkgdatadir)/xfonts/$$i ; \
-	done
-	$(INSTALL_DATA) xfonts/fonts.dir $(DESTDIR)$(pkgdatadir)/xfonts/fonts.dir
+	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 \
+	for i in $${files} ; do \
 	   $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(pkgdatadir)/$$i ; \
 	done
 
 install-exec-local: libinstalldirs
 	files=`cd $(srcdir) ; echo $(LYXSCRIPTS)` ; \
-	for i in $$(files) ; do \
+	for i in $${files} ; do \
 	   $(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 ; \
+	for i in $${files} ; do \
+	   rm -f $(DESTDIR)$(pkgdatadir)/$$i ; \
 	done ; \
 	dirs=`cd $(srcdir) ; echo $(LYXLIBDIRS)` ; \
-	for i in $$(dirs) ; do \
-	   rm -rf $(pkgdatadir)/$$i ; \
+	for i in $${dirs} ; do \
+	   rm -rf $(DESTDIR)$(pkgdatadir)/$$i ; \
 	done
 
 dist-hook: