X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Fsys_socket;h=b44e4f10fd44b16eb3dee6c5fc650dc988f6251c;hb=293ec82ede14e2a6f3443637e5a8fb9da9ce3cbe;hp=9e0c6b534ae7f6fe1e13fca2d4dad889a9ede0f0;hpb=b22f3b41a0494955d22a6be29480f12558e2c0b4;p=gnulib.git

diff --git a/modules/sys_socket b/modules/sys_socket
index 9e0c6b534..b44e4f10f 100644
--- a/modules/sys_socket
+++ b/modules/sys_socket
@@ -2,12 +2,12 @@ Description:
 A <sys/socket.h> for systems lacking it.
 
 Files:
-lib/socket_.h
+lib/sys_socket_.h
 m4/sys_socket_h.m4
 m4/sockpfaf.m4
 
 Depends-on:
-absolute-header
+include_next
 
 configure.ac:
 gl_HEADER_SYS_SOCKET
@@ -18,14 +18,15 @@ BUILT_SOURCES += $(SYS_SOCKET_H)
 
 # We need the following in order to create <sys/socket.h> when the system
 # doesn't have one that works with the given compiler.
-sys/socket.h: socket_.h
+sys/socket.h: sys_socket_.h
 	@MKDIR_P@ sys
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''ABSOLUTE_SYS_SOCKET_H''@|$(ABSOLUTE_SYS_SOCKET_H)|g' \
+	  sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+	      -e 's|@''NEXT_SYS_SOCKET_H''@|$(NEXT_SYS_SOCKET_H)|g' \
 	      -e 's|@''HAVE_SYS_SOCKET_H''@|$(HAVE_SYS_SOCKET_H)|g' \
 	      -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \
 	      -e 's|@''HAVE_WS2TCPIP_H''@|$(HAVE_WS2TCPIP_H)|g' \
-	      < $(srcdir)/socket_.h; \
+	      < $(srcdir)/sys_socket_.h; \
 	} > $@-t
 	mv -f $@-t $@
 MOSTLYCLEANFILES += sys/socket.h sys/socket.h-t
@@ -35,7 +36,7 @@ Include:
 #include <sys/socket.h>
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 Simon Josefsson