X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Fpty;h=d523d142ca1ede60c7d4feb561e6dc2da650df10;hb=e1c466d11a91615c413789ea8bc3ec358f2c6aa9;hp=aed2406473e69949a0c121ad2ece26ab06a17f23;hpb=c6681a7759d6c2ef9578d57ca8e05d0ae613ff09;p=gnulib.git

diff --git a/modules/pty b/modules/pty
index aed240647..d523d142c 100644
--- a/modules/pty
+++ b/modules/pty
@@ -6,9 +6,9 @@ lib/pty.in.h
 m4/pty_h.m4
 
 Depends-on:
-c++defs
 include_next
-warn-on-use
+snippet/c++defs
+snippet/warn-on-use
 
 configure.ac:
 gl_PTY_H
@@ -18,17 +18,20 @@ BUILT_SOURCES += pty.h
 
 # We need the following in order to create <pty.h> when the system
 # doesn't have one that works with the given compiler.
-pty.h: pty.in.h $(CXXDEFS_H) $(WARN_ON_USE_H)
+pty.h: pty.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|@''HAVE_PTY_H''@|$(HAVE_PTY_H)|g' \
+	  sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+	      -e 's|@''HAVE_PTY_H''@|$(HAVE_PTY_H)|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_PTY_H''@|$(NEXT_PTY_H)|g' \
-	      -e 's|@''GNULIB_FORKPTY''@|$(GNULIB_FORKPTY)|g' \
-	      -e 's|@''GNULIB_OPENPTY''@|$(GNULIB_OPENPTY)|g' \
+	      -e 's/@''GNULIB_FORKPTY''@/$(GNULIB_FORKPTY)/g' \
+	      -e 's/@''GNULIB_OPENPTY''@/$(GNULIB_OPENPTY)/g' \
 	      -e 's|@''HAVE_UTIL_H''@|$(HAVE_UTIL_H)|g' \
 	      -e 's|@''HAVE_LIBUTIL_H''@|$(HAVE_LIBUTIL_H)|g' \
+	      -e 's|@''HAVE_FORKPTY''@|$(HAVE_FORKPTY)|g' \
 	      -e 's|@''HAVE_OPENPTY''@|$(HAVE_OPENPTY)|g' \
 	      -e 's|@''REPLACE_FORKPTY''@|$(REPLACE_FORKPTY)|g' \
 	      -e 's|@''REPLACE_OPENPTY''@|$(REPLACE_OPENPTY)|g' \
@@ -46,7 +49,7 @@ Link:
 $(PTY_LIB)
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 Simon Josefsson