>>>>> "Albert" == Albert Chin <[EMAIL PROTECTED]> writes:

Albert> If xfonts/PSres.upr doesn't exists, the install-xfonts will
Albert> fail, causing 'make install' to fail.

Hello Albert,

Thanks for the report. I actually half-baked this PSres.upr support
and did not test it well enough.

Here is the patch I intend to use. 

JMarc

Index: lib/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/ChangeLog,v
retrieving revision 1.363.2.43
diff -u -p -r1.363.2.43 ChangeLog
--- lib/ChangeLog	3 Oct 2003 13:34:39 -0000	1.363.2.43
+++ lib/ChangeLog	5 Nov 2003 16:49:56 -0000
@@ -1,3 +1,8 @@
+2003-11-05  Jean-Marc Lasgouttes  <[EMAIL PROTECTED]>
+
+	* Makefile.am (install-xfonts): fix error when PSres.upr does not
+	exist 
+
 2003-10-02  Jean-Marc Lasgouttes  <[EMAIL PROTECTED]>
 
 	* bind/aqua.bind: fix typo
Index: lib/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/Makefile.am,v
retrieving revision 1.51.2.2
diff -u -p -r1.51.2.2 Makefile.am
--- lib/Makefile.am	17 Sep 2003 13:47:24 -0000	1.51.2.2
+++ lib/Makefile.am	5 Nov 2003 16:49:56 -0000
@@ -58,8 +58,10 @@ install-xfonts:
 	  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
-	test -f xfonts/PSres.upr && $(INSTALL_DATA) xfonts/PSres.upr $(DESTDIR)$(pkgdatadir)/xfonts/PSres.upr
+	$(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

Reply via email to