X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Fgetopt;h=39751bf331a2f088303549ae6abe6c9067f3b308;hb=e349e3d9c187700b118e0bac80aedd2ea8e764bc;hp=87022d1b558b9ee06aec84a5c4042f591ff1d6a7;hpb=abe574726d366cedfb5a58484fd3a102b587323c;p=gnulib.git

diff --git a/modules/getopt b/modules/getopt
index 87022d1b5..39751bf33 100644
--- a/modules/getopt
+++ b/modules/getopt
@@ -2,7 +2,7 @@ Description:
 Process command line arguments.
 
 Files:
-lib/getopt_.h
+lib/getopt.in.h
 lib/getopt.c
 lib/getopt1.c
 lib/getopt_int.h
@@ -10,20 +10,21 @@ m4/getopt.m4
 
 Depends-on:
 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: