(Files): Rename getopt.h to getopt_.h.

(Makefile.am): Rewrite, use logic from argz.
(Include): Use <getopt.h> instead of "getopt.h".

diff --git a/modules/getopt b/modules/getopt
index 149146c91d6f12f24ed7673b41e4b4080487b4bd..0e15175cbb9808973cca851500779336aaa48c1a 100644 (file)
--- a/modules/getopt
+++ b/modules/getopt
@@ -2,7 +2,7 @@ Description:
 Process command line arguments.
 
 Files:
-lib/getopt.h
+lib/getopt_.h
 lib/getopt.c
 lib/getopt1.c
 lib/getopt_int.h
@@ -15,10 +15,19 @@ configure.ac:
 gl_GETOPT
 
 Makefile.am:
-lib_SOURCES += getopt.h getopt.c getopt1.c getopt_int.h
+BUILT_SOURCES += $(GETOPT_H)
+EXTRA_DIST += getopt_.h getopt_int.h
+
+# We need the following in order to create an <getopt.h> when the system
+# doesn't have one that works with the given compiler.
+all-local $(lib_OBJECTS): $(GETOPT_H)
+getopt.h: getopt_.h
+       cp $(srcdir)/getopt_.h $@-t
+       mv $@-t $@
+MOSTLYCLEANFILES += getopt.h getopt.h-t
 
 Include:
-"getopt.h"
+<getopt.h>
 
 Maintainer:
 all, glibc