getgroups: Move AC_LIBOBJ invocations to module description.

[pspp] / modules / termios

diff --git a/modules/termios b/modules/termios
index 6af1195a3de0b3e508e4b5d4149837e6f4fdb02a..f747e9234e090b3edd12baf0fa42322e3dee9f78 100644 (file)
--- a/modules/termios
+++ b/modules/termios
@@ -14,20 +14,19 @@ configure.ac:
 gl_TERMIOS_H
 
 Makefile.am:
-nodist_pkginclude_HEADERS += termios.h
-
 BUILT_SOURCES += termios.h
 
 # We need the following in order to create <termios.h> when the system
 # version does not have all declarations.
-termios.h: termios.in.h $(CXXDEFS_H) $(WARN_ON_USE_H)
+termios.h: termios.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
        $(AM_V_GEN)rm -f $@-t $@ && \
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+         sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+             -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
              -e 's|@''NEXT_TERMIOS_H''@|$(NEXT_TERMIOS_H)|g' \
-             -e 's|@''GNULIB_TCGETSID''@|$(GNULIB_TCGETSID)|g' \
+             -e 's/@''GNULIB_TCGETSID''@/$(GNULIB_TCGETSID)/g' \
              -e 's|@''HAVE_DECL_TCGETSID''@|$(HAVE_DECL_TCGETSID)|g' \
              -e 's|@''HAVE_TERMIOS_H''@|$(HAVE_TERMIOS_H)|g' \
              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \