I presume the following patch is not controversial...

Solaris /usr/ucb/ln does not accept -sf, but wants '-f -s'.

OK to apply?

JMarc

Index: lib/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/ChangeLog,v
retrieving revision 1.332
diff -u -p -r1.332 ChangeLog
--- lib/ChangeLog	17 Dec 2002 00:20:58 -0000	1.332
+++ lib/ChangeLog	18 Dec 2002 15:11:44 -0000
@@ -1,3 +1,8 @@
+2002-12-18  Jean-Marc Lasgouttes  <[EMAIL PROTECTED]>
+
+	* Makefile.am (install-xfonts): do not use "ln -sf" since some
+	solaris versions do not like it. "ln -f -s" is better.
+
 2002-12-17  John Levon  <[EMAIL PROTECTED]>
 
 	* configure.m4: back out LaTeX viewer again
Index: lib/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/Makefile.am,v
retrieving revision 1.48
diff -u -p -r1.48 Makefile.am
--- lib/Makefile.am	25 Sep 2002 12:45:02 -0000	1.48
+++ lib/Makefile.am	18 Dec 2002 15:11:44 -0000
@@ -54,7 +54,7 @@ install-xfonts:
 	$(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 ; \
+	  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

Reply via email to