Changeset 28113

Timestamp:

2013-08-21T15:06:06+12:00 (11 years ago)

Author:

ak19

Message:

The Linux gdbm.h file, which gets re-generated during compilation, was wrong after yesterday's changes to gdbmerrno.h. The gdbm.h file is composed of 3 static files including gdbmerrno.h. The Makefile is what puts them together. But it was using a grep on underscores instead of a plain cat to stream the contents of gdbmerrno.h into the constructed gdbm.h. The filter on underscore left out the newly added hash-endif lines, so the Makefile now resorts to just cat-ing the contents of gdbmerrno.h.

File:

• main/trunk/greenstone2/common-src/packages/gdbm/gdbm-1.8.3/Makefile.in (modified) (1 diff)

main/trunk/greenstone2/common-src/packages/gdbm/gdbm-1.8.3/Makefile.in

@@ -178 +178 @@
         -version-info $(SHLIB_VER) $(C_LOBJS)
 
+# gdbm.h is a concatenation of gdbm.proto + gdbmerrno.h + gdbm.proto2
+# The old code used to skip lines in gdbmerrno.h that didn't have an underscore 
+# in them, in order to skip the large opening multiline comment. However, this
+# had the sideeffect of skipping important hash-endifs as well, so we're now using
+# just a plain cat to concatenate the entire file, including long opening comment.
+
 gdbm.h: gdbm.proto gdbmerrno.h gdbm.proto2
     rm -f gdbm.h
     cp $(srcdir)/gdbm.proto gdbm.h
     chmod +w gdbm.h
-    grep _ $(srcdir)/gdbmerrno.h >> gdbm.h
+#   grep _ $(srcdir)/gdbmerrno.h >> gdbm.h
+    cat $(srcdir)/gdbmerrno.h >> gdbm.h
     cat $(srcdir)/gdbm.proto2 >> gdbm.h
     chmod -w gdbm.h