X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Fgetopt;h=39751bf331a2f088303549ae6abe6c9067f3b308;hb=a111113ffb2fdce42aa007e7f3f9fecb1a40bfe7;hp=0446a4aeb7ee8c106304e253f09651b3163b35da;hpb=5143f4e91f44130093914be7cf05873c7d8a4369;p=gnulib.git

diff --git a/modules/getopt b/modules/getopt
index 0446a4aeb..39751bf33 100644
--- a/modules/getopt
+++ b/modules/getopt
@@ -2,28 +2,29 @@ Description:
 Process command line arguments.
 
 Files:
-lib/getopt_.h
+lib/getopt.in.h
 lib/getopt.c
 lib/getopt1.c
 lib/getopt_int.h
 m4/getopt.m4
 
 Depends-on:
-gettext
+gettext-h
+unistd
 
 configure.ac:
 gl_GETOPT
 
 Makefile.am:
 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
+# We need the following in order to create <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 $@
+getopt.h: getopt.in.h
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  cat $(srcdir)/getopt.in.h; \
+	} > $@-t
+	mv -f $@-t $@
 MOSTLYCLEANFILES += getopt.h getopt.h-t
 
 Include:
@@ -34,4 +35,3 @@ LGPL
 
 Maintainer:
 all, glibc
-