[pkg-opensc-commit] [pkcs11-helper] 18/44: Some fixups

[Eric Dorland]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to tag pkcs11-helper-1.06
in repository pkcs11-helper.

commit 2018a65fa91d9429376da8797d65018edc856ca9
Author: alonbl <alonbl at 485eb718-1723-0410-b8a9-88cf21a28c35>
Date:   Sat Feb 2 13:49:12 2008 +0000

    Some fixups
---
 configure.ac       |  4 ++--
 lib/Makefile.am    |  2 ++
 lib/versioninfo.rc | 15 ---------------
 3 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0194ac1..6def130 100644
--- a/configure.ac
+++ b/configure.ac
@@ -56,9 +56,9 @@ AM_CONFIG_HEADER([config.h])
 AC_CONFIG_SRCDIR([lib/common.h])
 
 T="${PACKAGE_VERSION}"
-PKCS11H_VERSION_MAJOR="${T%.*}"
+PKCS11H_VERSION_MAJOR="${T%%.*}"
 T="${T#*.}"
-PKCS11H_VERSION_MINOR="${T%_*}"
+PKCS11H_VERSION_MINOR="${T%%_*}"
 T="${T#*_}"
 PKCS11H_VERSION_FIX=0
 
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 7e304e8..611a489 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -88,6 +88,8 @@ libpkcs11_helper_la_LDFLAGS= \
 	-no-undefined
 if WIN32
 libpkcs11_helper_la_SOURCES+=versioninfo.rc
+else
+EXTRA_DIST+=versioninfo.rc
 endif
 
 pkcs11-helper.exports: \
diff --git a/lib/versioninfo.rc b/lib/versioninfo.rc
index 9e618d9..df89f7a 100644
--- a/lib/versioninfo.rc
+++ b/lib/versioninfo.rc
@@ -1,22 +1,7 @@
-/* versioninfo.rc.in - for libgcrypt
- *    Copyright (C) 2005, 2006 g10 Code GmbH
- * 
- * This file is free software; as a special exception the author gives
- * unlimited permission to copy and/or distribute it, with or without
- * modifications, as long as this notice is preserved.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
- * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- */
- 
 /* This file is processed by configure to create versioninfo.rc */
 
-#line __LINE__ "versioninfo.rc.in"
-
 #include <afxres.h>
 
-
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION 1,0,0,0
  PRODUCTVERSION 1,5,0,0

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opensc/pkcs11-helper.git