[Commit] fontconfig/fc-list fc-list.1,NONE,1.1 Makefile.am,1.3,1.4 fc-list.c,1.7,1.8 fc-list.man,1.2,NONE

[Keith Packard]

Committed by: keithp

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

Modified Files:
	Makefile.am fc-list.c 
Added Files:
	fc-list.1 
Removed Files:
	fc-list.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-list.1 ---
(This appears to be a binary file; contents omitted.)

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

Index: fc-list.c
===================================================================
RCS file: /local/src/CVS/fontconfig/fc-list/fc-list.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- fc-list.c	5 Mar 2003 05:46:54 -0000	1.7
+++ fc-list.c	31 May 2003 14:58:41 -0000	1.8
@@ -61,13 +61,24 @@
 
 static void usage (char *program)
 {
+#if HAVE_GETOPT_LONG
     fprintf (stderr, "usage: %s [-vV?] [--verbose] [--version] [--help] [pattern] {element ...} \n",
 	     program);
+#else
+    fprintf (stderr, "usage: %s [-vV?] [pattern] {element ...} \n",
+	     program);
+#endif
     fprintf (stderr, "List fonts matching [pattern]\n");
     fprintf (stderr, "\n");
+#if HAVE_GETOPT_LONG
     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, "  -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);
 }
 

--- fc-list.man DELETED ---