diff options
| author | Werner Koch <[email protected]> | 2006-11-21 11:00:14 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2006-11-21 11:00:14 +0000 |
| commit | e50c5f39cc2ea399eead30ef451d7d5e24c13fe6 (patch) | |
| tree | 37f73eb8abf85a3a6505a5a7c30b1e4c8e8d85d5 /scd | |
| parent | Made some PIN pads work. (diff) | |
| download | gnupg-e50c5f39cc2ea399eead30ef451d7d5e24c13fe6.tar.gz gnupg-e50c5f39cc2ea399eead30ef451d7d5e24c13fe6.zip | |
No more warnings for AMD64 (at least when cross-compiling). Thus tehre is a
good chance that gpg2 will now work.
Other cleanups.
Updated gettext.
Diffstat (limited to 'scd')
| -rw-r--r-- | scd/ChangeLog | 7 | ||||
| -rw-r--r-- | scd/Makefile.am | 8 | ||||
| -rw-r--r-- | scd/apdu.c | 2 | ||||
| -rw-r--r-- | scd/pcsc-wrapper.c | 2 |
4 files changed, 13 insertions, 6 deletions
diff --git a/scd/ChangeLog b/scd/ChangeLog index 3c1c373a6..7cfcb76b0 100644 --- a/scd/ChangeLog +++ b/scd/ChangeLog @@ -1,3 +1,10 @@ +2006-11-21 Werner Koch <[email protected]> + + * Makefile.am (libexec_PROGRAMS): Put pscs-wrapper into libexec. + Renamed to gnupg-pcsc-wrapper. + * apdu.c (open_pcsc_reader): Use GNUPG_LIBEXECDIR to accces the + wrapper. Suggested by Eric Dorland. + 2006-11-20 Werner Koch <[email protected]> * app-openpgp.c (verify_chv2): Support for keypads (only CHV2). diff --git a/scd/Makefile.am b/scd/Makefile.am index 894016cf8..405a611a5 100644 --- a/scd/Makefile.am +++ b/scd/Makefile.am @@ -21,7 +21,7 @@ bin_PROGRAMS = scdaemon if ! HAVE_W32_SYSTEM -pkglib_PROGRAMS = pcsc-wrapper +libexec_PROGRAMS = gnupg-pcsc-wrapper endif AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/common @@ -67,6 +67,6 @@ scdaemon_LDADD = ../jnlib/libjnlib.a ../common/libcommonpth.a ../gl/libgnu.a \ # $(LIBUSB_LIBS) \ # -lgpg-error @LIBINTL@ @DL_LIBS@ # -pcsc_wrapper_SOURCES = pcsc-wrapper.c -pcsc_wrapper_LDADD = $(DL_LIBS) -pcsc_wrapper_CFLAGS = +gnupg_pcsc_wrapper_SOURCES = pcsc-wrapper.c +gnupg_pcsc_wrapper_LDADD = $(DL_LIBS) +gnupg_pcsc_wrapper_CFLAGS = diff --git a/scd/apdu.c b/scd/apdu.c index e83ce3c3e..3057d6415 100644 --- a/scd/apdu.c +++ b/scd/apdu.c @@ -1338,7 +1338,7 @@ open_pcsc_reader (const char *portstr) int err; unsigned int dummy_status; int sw = SW_HOST_CARD_IO_ERROR; - const char *wrapperpgm = GNUPG_LIBDIR "/pcsc-wrapper"; + const char *wrapperpgm = GNUPG_LIBEXECDIR "/gnupg-pcsc-wrapper"; if (access (wrapperpgm, X_OK)) { diff --git a/scd/pcsc-wrapper.c b/scd/pcsc-wrapper.c index 0e362a16a..633d5b80e 100644 --- a/scd/pcsc-wrapper.c +++ b/scd/pcsc-wrapper.c @@ -1,4 +1,4 @@ -/* pcsc-wrapper.c - Wrapper for ccessing the PC/SC service +/* pcsc-wrapper.c - Wrapper for accessing the PC/SC service * Copyright (C) 2003, 2004 Free Software Foundation, Inc. * * This file is part of GnuPG. |