From 4827ae1c4f7f5383655496e7556f67908e1db697 Mon Sep 17 00:00:00 2001 From: dooglus Date: Fri, 6 Apr 2007 13:16:24 +0000 Subject: [PATCH] Apply 1695494: fix version number in the Win32 registry, add API_VERSION variable. Patch by Dmitriy Pomerantsev (Atrus) git-svn-id: http://svn.voria.com/code@440 1f10aa63-cdf2-0310-b900-c93c546f37ac --- synfig-studio/trunk/bootstrap | 1 + synfig-studio/trunk/config/configure.ac | 3 +++ synfig-studio/trunk/win32inst.nsi.in | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/synfig-studio/trunk/bootstrap b/synfig-studio/trunk/bootstrap index 69b215a..a0e48bb 100755 --- a/synfig-studio/trunk/bootstrap +++ b/synfig-studio/trunk/bootstrap @@ -26,6 +26,7 @@ s/@PACKAGE_TARNAME@/$PACKAGE_TARNAME/g; s/@PACKAGE_VERSION@/$PACKAGE_VERSION/g; s|@SVN_REPOSITORY@|$SVN_REPOSITORY|g; s/@VERSION@/$VERSION/g; +s/@API_VERSION@/$API_VERSION/g; s/@VERSION_MAJ@/$VERSION_MAJ/g; s/@VERSION_MIN@/$VERSION_MIN/g; s/@VERSION_REV@/$VERSION_REV/g; diff --git a/synfig-studio/trunk/config/configure.ac b/synfig-studio/trunk/config/configure.ac index 042a8cf..636f19b 100755 --- a/synfig-studio/trunk/config/configure.ac +++ b/synfig-studio/trunk/config/configure.ac @@ -15,6 +15,7 @@ dnl AC_CANONICAL_TARGET AM_INIT_AUTOMAKE AM_MAINTAINER_MODE +API_VERSION=@API_VERSION@ # -- V A R I A B L E S ---------------------------------------- @@ -155,6 +156,8 @@ AC_SUBST(CXXFLAGS) AC_SUBST(LDFLAGS) AC_SUBST(SVN_REPOSITORY) +AC_SUBST(API_VERSION) + VERSION_MAJ=@VERSION_MAJ@ VERSION_MIN=@VERSION_MIN@ VERSION_REV=@VERSION_REV@ diff --git a/synfig-studio/trunk/win32inst.nsi.in b/synfig-studio/trunk/win32inst.nsi.in index 5041e0f..e13fda1 100644 --- a/synfig-studio/trunk/win32inst.nsi.in +++ b/synfig-studio/trunk/win32inst.nsi.in @@ -73,7 +73,7 @@ Section "Synfig Studio" FileClose $0 WriteRegStr HKLM "${PRODUCT_REG_KEY}" "Path" "$INSTDIR" - WriteRegStr HKLM "${PRODUCT_REG_KEY}" "Version" "@PRODUCT_VERSION@" + WriteRegStr HKLM "${PRODUCT_REG_KEY}" "Version" "@PACKAGE_VERSION@" ; Write the uninstall keys for Windows WriteRegStr HKLM "${PRODUCT_UNINSTALL_KEY}" "DisplayName" "@PACKAGE_NAME@" -- 2.7.4