Changeset 28113

Show
Ignore:
Timestamp:
21.08.2013 15:06:06 (6 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.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/common-src/packages/gdbm/gdbm-1.8.3/Makefile.in

    r26654 r28113  
    178178        -version-info $(SHLIB_VER) $(C_LOBJS) 
    179179 
     180# gdbm.h is a concatenation of gdbm.proto + gdbmerrno.h + gdbm.proto2 
     181# The old code used to skip lines in gdbmerrno.h that didn't have an underscore  
     182# in them, in order to skip the large opening multiline comment. However, this 
     183# had the sideeffect of skipping important hash-endifs as well, so we're now using 
     184# just a plain cat to concatenate the entire file, including long opening comment. 
     185 
    180186gdbm.h: gdbm.proto gdbmerrno.h gdbm.proto2 
    181187    rm -f gdbm.h 
    182188    cp $(srcdir)/gdbm.proto gdbm.h 
    183189    chmod +w gdbm.h 
    184     grep _ $(srcdir)/gdbmerrno.h >> gdbm.h 
     190#   grep _ $(srcdir)/gdbmerrno.h >> gdbm.h 
     191    cat $(srcdir)/gdbmerrno.h >> gdbm.h 
    185192    cat $(srcdir)/gdbm.proto2 >> gdbm.h 
    186193    chmod -w gdbm.h