Changeset 1562

Show
Ignore:
Timestamp:
05/17/09 07:56:44 (11 years ago)
Author:
ppalmers
Message:

generate correct version strings for exported versions (i.e. no - at the end)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/libffado-2.0/config.h.in

    r1536 r1562  
    1313 
    1414/* Define to the full name and version of this package. */ 
    15 #define PACKAGE_STRING "$PACKAGE $VERSION-$REVISION
     15#define PACKAGE_STRING "$PACKAGE $VERSION$REVISIONSTRING
    1616 
    1717/* Define to the one symbol short name of this package. */ 
     
    1919 
    2020/* Define to the version of this package. */ 
    21 #define PACKAGE_VERSION "$VERSION-$REVISION
     21#define PACKAGE_VERSION "$VERSION$REVISIONSTRING
    2222 
    2323/* Define to the version of the cace. */ 
    24 #define CACHE_VERSION "$VERSION-$REVISION
     24#define CACHE_VERSION "$VERSION$REVISIONSTRING
    2525#define CACHEDIR "$CACHEDIR" 
    2626 
  • branches/libffado-2.0/SConstruct

    r1561 r1562  
    488488        env['REVISION'] = '' 
    489489 
    490 env['FFADO_API_VERSION']=FFADO_API_VERSION 
     490# avoid the 1.999.41- type of version for exported versions 
     491if env['REVISION'] != '': 
     492        env['REVISIONSTRING'] = '-' + env['REVISION'] 
     493else: 
     494        env['REVISIONSTRING'] = '' 
     495 
     496env['FFADO_API_VERSION'] = FFADO_API_VERSION 
    491497 
    492498env['PACKAGE'] = "libffado"