[Commit] fontconfig/fc-cache fc-cache.1,NONE,1.1 Makefile.am,1.3,1.4 fc-cache.c,1.12,1.13 fc-cache.man,1.2,NONE

Keith Packard commit at keithp.com
Sat May 31 08:58:43 PDT 2003


Committed by: keithp

Update of /local/src/CVS/fontconfig/fc-cache
In directory home.keithp.com:/tmp/cvs-serv17198/fc-cache

Modified Files:
	Makefile.am fc-cache.c 
Added Files:
	fc-cache.1 
Removed Files:
	fc-cache.man 
Log Message:
(Bug 87) Automake 1.4 doesn't do man_MAN1 correctly
(Bug 88) Fix usage info on non-long option systems (Tim Mooney)


--- NEW FILE: fc-cache.1 ---
(This appears to be a binary file; contents omitted.)

Index: Makefile.am
===================================================================
RCS file: /local/src/CVS/fontconfig/fc-cache/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile.am	7 Mar 2003 20:04:13 -0000	1.3
+++ Makefile.am	31 May 2003 14:58:41 -0000	1.4
@@ -23,10 +23,10 @@
 
 INCLUDES=$(FREETYPE_CFLAGS)
 
-man1_MANS=fc-cache.man
+man_MANS=fc-cache.1
 
 bin_PROGRAMS=fc-cache
 
-EXTRA_DIST=$(man1_MANS)
+EXTRA_DIST=$(man_MANS)
 
 fc_cache_LDADD = ../src/libfontconfig.la

Index: fc-cache.c
===================================================================
RCS file: /local/src/CVS/fontconfig/fc-cache/fc-cache.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- fc-cache.c	5 Mar 2003 05:46:54 -0000	1.12
+++ fc-cache.c	31 May 2003 14:58:41 -0000	1.13
@@ -67,16 +67,29 @@
 static void
 usage (char *program)
 {
-    fprintf (stderr, "usage: %s [-fvV?] [--force] [--verbose] [--version] [--help] [dirs]\n",
+#if HAVE_GETOPT_LONG
+    fprintf (stderr, "usage: %s [-fsvV?] [--force] [--system-only] [--verbose] [--version] [--help] [dirs]\n",
+	     program);
+#else
+    fprintf (stderr, "usage: %s [-fsvV?] [dirs]\n",
 	     program);
+#endif
     fprintf (stderr, "Build font information caches in [dirs]\n"
 	     "(all directories in font configuration by default).\n");
     fprintf (stderr, "\n");
+#if HAVE_GETOPT_LONG
     fprintf (stderr, "  -f, --force          scan directories with apparently valid caches\n");
     fprintf (stderr, "  -s, --system-only    scan system-wide directories only\n");
     fprintf (stderr, "  -v, --verbose        display status information while busy\n");
     fprintf (stderr, "  -V, --version        display font config version and exit\n");
     fprintf (stderr, "  -?, --help           display this help and exit\n");
+#else
+    fprintf (stderr, "  -f         (force)   scan directories with apparently valid caches\n");
+    fprintf (stderr, "  -s         (system)  scan system-wide directories only\n");
+    fprintf (stderr, "  -v         (verbose) display status information while busy\n");
+    fprintf (stderr, "  -V         (version) display font config version and exit\n");
+    fprintf (stderr, "  -?         (help)    display this help and exit\n");
+#endif
     exit (1);
 }
 
@@ -216,9 +229,9 @@
     int		c;
 
 #if HAVE_GETOPT_LONG
-    while ((c = getopt_long (argc, argv, "fVv?", longopts, NULL)) != -1)
+    while ((c = getopt_long (argc, argv, "fsVv?", longopts, NULL)) != -1)
 #else
-    while ((c = getopt (argc, argv, "fVv?")) != -1)
+    while ((c = getopt (argc, argv, "fsVv?")) != -1)
 #endif
     {
 	switch (c) {

--- fc-cache.man DELETED ---




More information about the Commit mailing list