install-reloc: Support multi-binary installation.

[gnulib.git] / modules / getopt-posix

diff --git a/modules/getopt-posix b/modules/getopt-posix
index 5da0b47..b82d6b2 100644 (file)
--- a/modules/getopt-posix
+++ b/modules/getopt-posix
@@ -12,7 +12,7 @@ Depends-on:
 unistd
 extensions
 include_next
-arg-nonnull
+snippet/arg-nonnull
 gettext-h       [test $REPLACE_GETOPT = 1]
 
 configure.ac:
@@ -21,7 +21,10 @@ if test $REPLACE_GETOPT = 1; then
   AC_LIBOBJ([getopt])
   AC_LIBOBJ([getopt1])
   gl_PREREQ_GETOPT
+  dnl Arrange for unistd.h to include getopt.h.
+  GNULIB_${gl_include_guard_prefix}_UNISTD_H_GETOPT=1
 fi
+AC_SUBST([GNULIB_${gl_include_guard_prefix}_UNISTD_H_GETOPT])
 
 Makefile.am:
 BUILT_SOURCES += $(GETOPT_H)