X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2FMakefile.am;h=f8894eeb6b27513b56d427293146d8f47da30bb5;hb=68bc27c3b927208d99a364dc223a905b657426f7;hp=bf7c43122c8bbbeec518a34ff41d92fcc6713238;hpb=76d81111af32896298457a2abcd1e21c3d507f5f;p=lyx.git

diff --git a/lib/Makefile.am b/lib/Makefile.am
index bf7c43122c..f8894eeb6b 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
@@ -13,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
@@ -31,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 \
-	     templates tex ui xfonts
+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) $< > $@
@@ -51,38 +51,46 @@ libinstalldirs:
 	done
 
 install-xfonts:
-	files=`sed -e 's/^\([^ ]*\) .*$$/\1/' xfonts/fonts.dir` ; \
+	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
+	  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
 
+uninstall-xfonts:
+	rm -rf $(DESTDIR)$(pkgdatadir)/xfonts
+
+distclean-local:
+	rm -rf xfonts
+
 install-data-local: libinstalldirs install-xfonts
-	files=`cd ${srcdir} ; echo $(LIBINSTFILES)` ; \
+	files=`cd $(srcdir) ; echo $(LIBINSTFILES)` ; \
 	for i in $${files} ; do \
-	   $(INSTALL_DATA) ${srcdir}/$$i $(DESTDIR)$(pkgdatadir)/$$i ; \
+	   $(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\*` ; \
+	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 ; }