trivial: Fix substitution of FWUPD_x_VERSION in fwupd-version.h

This commit is contained in:
Richard Hughes 2017-04-19 10:15:16 +01:00
parent a9a99bdb48
commit e1c9a5c476
2 changed files with 9 additions and 3 deletions

View File

@ -39,21 +39,27 @@
* *
* The compile-time major version * The compile-time major version
*/ */
#ifndef FWUPD_MAJOR_VERSION
#define FWUPD_MAJOR_VERSION (@FWUPD_MAJOR_VERSION@) #define FWUPD_MAJOR_VERSION (@FWUPD_MAJOR_VERSION@)
#endif
/** /**
* FWUPD_MINOR_VERSION: * FWUPD_MINOR_VERSION:
* *
* The compile-time minor version * The compile-time minor version
*/ */
#ifndef FWUPD_MINOR_VERSION
#define FWUPD_MINOR_VERSION (@FWUPD_MINOR_VERSION@) #define FWUPD_MINOR_VERSION (@FWUPD_MINOR_VERSION@)
#endif
/** /**
* FWUPD_MICRO_VERSION: * FWUPD_MICRO_VERSION:
* *
* The compile-time micro version * The compile-time micro version
*/ */
#ifndef FWUPD_MICRO_VERSION
#define FWUPD_MICRO_VERSION (@FWUPD_MICRO_VERSION@) #define FWUPD_MICRO_VERSION (@FWUPD_MICRO_VERSION@)
#endif
/** /**
* FWUPD_CHECK_VERSION: * FWUPD_CHECK_VERSION:

View File

@ -11,9 +11,9 @@ fwupd_minor_version = varr[1]
fwupd_micro_version = varr[2] fwupd_micro_version = varr[2]
conf = configuration_data() conf = configuration_data()
conf.set('FWUPD_MAJOR_VERSION_CONF', fwupd_major_version) conf.set('FWUPD_MAJOR_VERSION', fwupd_major_version)
conf.set('FWUPD_MINOR_VERSION_CONF', fwupd_minor_version) conf.set('FWUPD_MINOR_VERSION', fwupd_minor_version)
conf.set('FWUPD_MICRO_VERSION_CONF', fwupd_micro_version) conf.set('FWUPD_MICRO_VERSION', fwupd_micro_version)
conf.set_quoted('PACKAGE_VERSION', fwupd_version) conf.set_quoted('PACKAGE_VERSION', fwupd_version)
# libtool versioning - this applies to libfwupd # libtool versioning - this applies to libfwupd