[Pcsclite-cvs-commit] r5090 - /trunk/Drivers/ccid/src/Makefile.am

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Sun Aug  1 17:15:40 2010
New Revision: 5090

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=5090
Log:
Install the serial configuration find in /etc/reader.conf.d/libccidtwin
instead of /etc/reader.conf.
pcscd (>= 1.6.0) will parse all the files from /etc/reader.conf.d/

Modified:
    trunk/Drivers/ccid/src/Makefile.am

Modified: trunk/Drivers/ccid/src/Makefile.am
URL: http://svn.debian.org/wsvn/pcsclite/trunk/Drivers/ccid/src/Makefile.am?rev=5090&op=diff
==============================================================================
--- trunk/Drivers/ccid/src/Makefile.am (original)
+++ trunk/Drivers/ccid/src/Makefile.am Sun Aug  1 17:15:40 2010
@@ -94,13 +94,8 @@
 	$(mkinstalldirs) $(DESTDIR)$(ccidtwindir)
 	cp .libs/$(CCIDTWIN_LIB) $(DESTDIR)$(ccidtwindir)/$(CCIDTWIN_LIB).$(VERSION)
 	ln -fs $(CCIDTWIN_LIB).$(VERSION) $(DESTDIR)$(ccidtwindir)/$(CCIDTWIN_LIB)
-	if [ -e $(DESTDIR)/etc/reader.conf ] ; \
-	then \
-		echo "Edit existing /etc/reader.conf" ; \
-	else \
-		$(mkinstalldirs) $(DESTDIR)/etc ; \
-		perl -ne "s|TARGET|$(ccidtwindir)/$(CCIDTWIN_LIB)| ; print" $(srcdir)/reader.conf.in > $(DESTDIR)/etc/reader.conf ; \
-	fi
+	$(mkinstalldirs) $(DESTDIR)/etc/reader.conf.d ; \
+		perl -ne "s|TARGET|$(ccidtwindir)/$(CCIDTWIN_LIB)| ; print" $(srcdir)/reader.conf.in > $(DESTDIR)/etc/reader.conf.d/libccidtwin
 
 # do not uninstall the serial driver by default
 # use explicitely 'make uninstall_ccidtwin'