Ignore:
Timestamp:
Jul 17, 2009, 9:46:45 PM (12 years ago)
Author:
Nelson Elhage <nelhage@mit.edu>
Branches:
master, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9
Children:
2f2a643, f9c93cd
Parents:
a52d13a (diff), c08a725 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:
Merge branch 'automake'

Conflicts:
	Makefile.in
	libfaim/Makefile.in
	owl.h
File:
1 edited

Legend:

Unmodified
Added
Removed
  • scripts/locker-build

    re477a53 r130633c  
    7575(
    7676    cd "$TMPDIR"/* || die "Unable to cd to $TMPDIR"
    77     VERS=$(perl -ne 'print $1 if m{^#define\s*OWL_VERSION_STRING\s*"([^"]+)"}' owl.h)
     77    VERS=$(perl -ne 'print $1 if m{^AC_INIT\(\[[^\]]+\],\s*\[([^\]]+)\]}' configure.ac)
    7878    test -z "$VERS" && die "Unable to detect barnowl version."
    7979
Note: See TracChangeset for help on using the changeset viewer.