Commit 8e4fba6a7f130a6eac080bc371810e36c12788e9

Authored by Perry Werneck
2 parents 1493755f 8487b328
Exists in master and in 1 other branch develop

Merge branch 'master' into develop

@@ -212,6 +212,9 @@ AC_SUBST(PACKAGE_MINOR_VERSION,$app_vrs_minor) @@ -212,6 +212,9 @@ AC_SUBST(PACKAGE_MINOR_VERSION,$app_vrs_minor)
212 212
213 AC_ARG_WITH([release], [AS_HELP_STRING([--with-release], [Set release])], [ app_cv_release="$withval" ],[ app_cv_release="`date +%-y`.`date +%-m`.`date +%-d`" ]) 213 AC_ARG_WITH([release], [AS_HELP_STRING([--with-release], [Set release])], [ app_cv_release="$withval" ],[ app_cv_release="`date +%-y`.`date +%-m`.`date +%-d`" ])
214 214
  215 +AC_ARG_WITH([product-id], [AS_HELP_STRING([--product-id], [Set the product ID])], [ app_cv_product_id="$withval" ],[ app_cv_product_id="br.app.pw3270" ])
  216 +AC_SUBST(PRODUCT_ID,"$app_cv_product_id")
  217 +
215 app_rls_major=$(echo $app_cv_release.0.0 | cut -d. -f1) 218 app_rls_major=$(echo $app_cv_release.0.0 | cut -d. -f1)
216 app_rls_minor=$(echo $app_cv_release.0.0 | cut -d. -f2) 219 app_rls_minor=$(echo $app_cv_release.0.0 | cut -d. -f2)
217 220
sdk/lib3270-delayed.pc.in
@@ -8,6 +8,7 @@ version_minor=@PACKAGE_MINOR_VERSION@ @@ -8,6 +8,7 @@ version_minor=@PACKAGE_MINOR_VERSION@
8 sdk_version=@LIB3270_SDK_VERSION@ 8 sdk_version=@LIB3270_SDK_VERSION@
9 library_name=@LIB3270_NAME@ 9 library_name=@LIB3270_NAME@
10 product_name=@PRODUCT_NAME@ 10 product_name=@PRODUCT_NAME@
  11 +product_id=@PRODUCT_ID@
11 12
12 Name: @PACKAGE_NAME@ 13 Name: @PACKAGE_NAME@
13 Description: @PACKAGE_DESCRIPTION@ 14 Description: @PACKAGE_DESCRIPTION@
sdk/lib3270-static.pc.in
@@ -9,6 +9,7 @@ sdk_version=@LIB3270_SDK_VERSION@ @@ -9,6 +9,7 @@ sdk_version=@LIB3270_SDK_VERSION@
9 library_name=@LIB3270_NAME@ 9 library_name=@LIB3270_NAME@
10 product_name=@PRODUCT_NAME@ 10 product_name=@PRODUCT_NAME@
11 default_host=@LIB3270_DEFAULT_HOST@ 11 default_host=@LIB3270_DEFAULT_HOST@
  12 +product_id=@PRODUCT_ID@
12 13
13 Name: @PACKAGE_NAME@-static 14 Name: @PACKAGE_NAME@-static
14 Description: @PACKAGE_DESCRIPTION@ (static library) 15 Description: @PACKAGE_DESCRIPTION@ (static library)
sdk/lib3270.pc.in
@@ -9,6 +9,7 @@ sdk_version=@LIB3270_SDK_VERSION@ @@ -9,6 +9,7 @@ sdk_version=@LIB3270_SDK_VERSION@
9 library_name=@LIB3270_NAME@ 9 library_name=@LIB3270_NAME@
10 product_name=@PRODUCT_NAME@ 10 product_name=@PRODUCT_NAME@
11 default_host=@LIB3270_DEFAULT_HOST@ 11 default_host=@LIB3270_DEFAULT_HOST@
  12 +product_id=@PRODUCT_ID@
12 13
13 Name: @PACKAGE_NAME@ 14 Name: @PACKAGE_NAME@
14 Description: @PACKAGE_DESCRIPTION@ 15 Description: @PACKAGE_DESCRIPTION@