Index: xc/ChangeLog
===================================================================
RCS file: /cvs/xorg/xc/ChangeLog,v
retrieving revision 1.29
diff -u -2 -0 -r1.29 ChangeLog
--- a/xc/ChangeLog	16 May 2004 21:52:44 -0000	1.29
+++ b/xc/ChangeLog	17 May 2004 01:37:12 -0000
@@ -1,21 +1,26 @@
 2004-05-16 Roland Mainz <roland.mainz@nrubsig.org>
+        * xc/programs/Xserver/Xprint/etc/init.d/xprint
+	BugZilla #451: /etc/init.d/xprint may output warnings when
+        /usr/share/fonts/ does not exist on a Linux installation.
+
+2004-05-16 Roland Mainz <roland.mainz@nrubsig.org>
         * xc/programs/xdpyinfo/Imakefile
         * xc/programs/xdpyinfo/xdpyinfo.c
 	BugZilla #623: RFE: "xdpyinfo" should have support for
         XpExtension.
 
 2004-05-15  Alan Coopersmith  <alan.coopersmith@sun.com>
 	* xc/programs/Xserver/fb/fb.h
 	* xc/programs/Xserver/fb/fboverlay.c
 	* xc/programs/Xserver/fb/fbscreen.c
 	- Change #ifdef for checking for old format miScreenInit to
 	  FB_OLD_MISCREENINIT for easier portability to xservers with
 	  updated screen structs but old function prototypes.  Make
 	  it automatically defined if FB_OLD_SCREEN is defined.
 	- Add _LP64 to list of #ifdefs for 64-bit platforms to support
 	  64-bit Solaris.
 
 2004-05-15  Alan Coopersmith  <alan.coopersmith@sun.com>	
 	* xc/programs/Xserver/hw/xfree86/xf86config/Imakefile
 	* xc/programs/Xserver/hw/xfree86/xf86config/xorgconfig.c
 	- Clean up server name changes from TM branch
Index: xc/programs/Xserver/Xprint/etc/init.d/xprint
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/Xprint/etc/init.d/xprint,v
retrieving revision 1.2
diff -u -2 -0 -r1.2 xprint
--- a/xc/programs/Xserver/Xprint/etc/init.d/xprint	23 Apr 2004 18:57:50 -0000	1.2
+++ b/xc/programs/Xserver/Xprint/etc/init.d/xprint	17 May 2004 01:37:20 -0000
@@ -315,41 +315,44 @@
           #echo "${XPROJECTROOT}/lib/X11/fonts/Type1/sun/"
           echo "${XPROJECTROOT}/lib/X11/fonts/TrueType/"
           echo "${XPROJECTROOT}/lib/X11/fonts/Speedo/"
           echo "${XPROJECTROOT}/lib/X11/fonts/misc/"
           echo "${XPROJECTROOT}/lib/X11/fonts/75dpi/"
           echo "${XPROJECTROOT}/lib/X11/fonts/100dpi/"
   
           ## List all fonts in all locales installed on this machine
           cat /usr/openwin/lib/locale/*/OWfontpath | tr "," "\n" | sort -u
           ;;
       'Linux')
           (
             get_fontlist_from_defoma
 
             get_fontlist_from_xf86config
             
             # Getting font paths from XFS is mainly required for compatibilty to RedHat
             get_fontlist_from_all_xfs_configs
                    
             ## List all fonts in all locales installed on this machine
-            find /usr/share/fonts "${XPROJECTROOT}/lib/X11/fonts" -name fonts.dir | 
+            (
+              [ -d "/usr/share/fonts" ] && find /usr/share/fonts -name fonts.dir
+              find "${XPROJECTROOT}/lib/X11/fonts" -name fonts.dir 
+            ) | 
               while read i ; do echo "${i%/fonts.dir}" ; done
           ) | sort -u
           ;;
       * | 'AIX')          
           ## List the standard X11 fonts
           # (AIX should be handled like Solaris but I did not found a way to
           # enumerate all fonts in all installed locales without scanning the
           # dirs manually)
           echo "${XPROJECTROOT}/lib/X11/fonts/Type1/"
           echo "${XPROJECTROOT}/lib/X11/fonts/TrueType/"
           echo "${XPROJECTROOT}/lib/X11/fonts/TTF/"
           echo "${XPROJECTROOT}/lib/X11/fonts/Speedo/"
           echo "${XPROJECTROOT}/lib/X11/fonts/misc/"
           echo "${XPROJECTROOT}/lib/X11/fonts/75dpi/"
           echo "${XPROJECTROOT}/lib/X11/fonts/100dpi/"
           echo "${XPROJECTROOT}/lib/X11/fonts/"
           ;;
     esac
 }