X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fsearch;h=7adddc144d4bd336aba9c397bd373b6b2f6f7573;hb=f5700d5db39e8d77b5f8d937580dcb01fe9f6a35;hp=cb049861d4760273117a64e8aa8eeefc2a1f5fe1;hpb=0ab583c0eaeb5d9c18a6ce0fcdd4f0cd95a581da;p=gnulib.git

diff --git a/modules/search b/modules/search
index cb049861d..7adddc144 100644
--- a/modules/search
+++ b/modules/search
@@ -6,10 +6,10 @@ lib/search.in.h
 m4/search_h.m4
 
 Depends-on:
-arg-nonnull
-c++defs
 include_next
-warn-on-use
+snippet/arg-nonnull
+snippet/c++defs
+snippet/warn-on-use
 
 configure.ac:
 gl_SEARCH_H
@@ -28,7 +28,7 @@ search.h: search.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
 	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_SEARCH_H''@|$(NEXT_SEARCH_H)|g' \
-	      -e 's|@''GNULIB_TSEARCH''@|$(GNULIB_TSEARCH)|g' \
+	      -e 's/@''GNULIB_TSEARCH''@/$(GNULIB_TSEARCH)/g' \
 	      -e 's|@''HAVE_TSEARCH''@|$(HAVE_TSEARCH)|g' \
 	      -e 's|@''REPLACE_TSEARCH''@|$(REPLACE_TSEARCH)|g' \
 	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \