From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 29 May 2011 21:31:22 +0000 (-0700)
Subject: * modules/assert-h (assert.h): Substitute the symbol-prefix more consistently.
X-Git-Tag: v0.1~2679
X-Git-Url: http://erislabs.net/gitweb/?a=commitdiff_plain;h=3532d15484ebc37feded387216d716bc1c3533f6;p=gnulib.git

* modules/assert-h (assert.h): Substitute the symbol-prefix more consistently.
---

diff --git a/ChangeLog b/ChangeLog
index bd060c737..f287f4b24 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
 	assert-h: work around 'verify' incompatibility
 	* lib/verify.h: Use @...@ directives, not ifdef.
 	* modules/assert-h (assert.h): Implement the directives.
+	(assert.h): Substitute the symbol-prefix more consistently.
 
 2011-05-29  Jim Meyering  <meyering@redhat.com>
 
diff --git a/modules/assert-h b/modules/assert-h
index f7eb48244..85d6fc844 100644
--- a/modules/assert-h
+++ b/modules/assert-h
@@ -26,10 +26,10 @@ assert.h: assert.in.h verify.h $(top_builddir)/config.status
 	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_ASSERT_H''@|$(NEXT_ASSERT_H)|g' \
 	      < $(srcdir)/assert.in.h && \
-	  sed -e 's|_GL_VERIFY_H|_${gl_include_guard_prefix}_STATIC_ASSERT_H|g' \
-	      -e '/@assert.h omit start@/,/@assert.h omit end@/d' \
+	  sed -e '/@assert.h omit start@/,/@assert.h omit end@/d' \
 	      -e 's|_gl_verify|_gl_static_assert|g' \
 	      -e 's|_GL_VERIFY|_GL_STATIC_ASSERT|g' \
+	      -e 's|_GL\(_STATIC_ASSERT_H\)|_${gl_include_guard_prefix}\1|g' \
 	      < $(srcdir)/verify.h; \
 	} > $@-t && \
 	mv $@-t $@