# HG changeset patch
# User Ivo Raisr <ivo.raisr@oracle.com>
# Date 1470682731 25200
# Node ID 6c50cb7e9ba088c63f9de974480afb7946862bec
# Parent  25e0012b607e07ea6b9ccb1ff946d92e10a777f7
24392172 pcscd should reside in /usr/lib

diff -r 25e0012b607e -r 6c50cb7e9ba0 components/pcsc-lite/Makefile
--- a/components/pcsc-lite/Makefile	Mon Aug 08 11:52:10 2016 -0700
+++ b/components/pcsc-lite/Makefile	Mon Aug 08 11:58:51 2016 -0700
@@ -60,6 +60,7 @@
 
 # options needed for configure, otherwise default will install into /usr/local
 CONFIGURE_OPTIONS +=    --exec-prefix=$(USRLIBDIR64)
+CONFIGURE_OPTIONS +=    --sbindir=$(USRLIBDIR)
 CONFIGURE_OPTIONS +=    --enable-libusb
 CONFIGURE_OPTIONS +=    --enable-confdir=$(ETCDIR)/pcsc
 CONFIGURE_OPTIONS +=    --enable-usbdropdir=$(USRLIBDIR64)/pcsc/drivers
diff -r 25e0012b607e -r 6c50cb7e9ba0 components/pcsc-lite/Solaris/svc-pcscd
--- a/components/pcsc-lite/Solaris/svc-pcscd	Mon Aug 08 11:52:10 2016 -0700
+++ b/components/pcsc-lite/Solaris/svc-pcscd	Mon Aug 08 11:58:51 2016 -0700
@@ -26,7 +26,7 @@
 . /lib/svc/share/smf_include.sh
 
 NAME=pcscd
-DAEMON=/usr/sbin/$NAME
+DAEMON=/usr/lib/$NAME
 PIDFILE=$SMF_SYSVOL_FS/$NAME.pid
 
 # exit if the server daemon is not installed
diff -r 25e0012b607e -r 6c50cb7e9ba0 components/pcsc-lite/pcsclite.p5m
--- a/components/pcsc-lite/pcsclite.p5m	Mon Aug 08 11:52:10 2016 -0700
+++ b/components/pcsc-lite/pcsclite.p5m	Mon Aug 08 11:58:51 2016 -0700
@@ -50,6 +50,5 @@
 file path=usr/lib/$(MACH64)/libpcsclite.so.1.0.0
 dir  path=usr/lib/$(MACH64)/pcsc/drivers
 file path=usr/lib/$(MACH64)/pkgconfig/libpcsclite.pc
-file path=usr/sbin/pcscd
-file path=usr/share/doc/pcsc-lite/README.DAEMON
+file path=usr/lib/pcscd mode=0555
 license pcsclite.license license="GPL v.3"