assert-h: work around 'verify' incompatibility

[pspp] / modules / assert-h

diff --git a/modules/assert-h b/modules/assert-h
index 50bd9f83e146d0b7b365641c3bd0e4c3f92d18ad..f7eb48244e693d900ed73b32f99e1755a362ccf1 100644 (file)
--- a/modules/assert-h
+++ b/modules/assert-h
@@ -26,7 +26,9 @@ 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|_gl_static_assert|g' \
+         sed -e 's|_GL_VERIFY_H|_${gl_include_guard_prefix}_STATIC_ASSERT_H|g' \
+             -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' \
              < $(srcdir)/verify.h; \
        } > $@-t && \