- switched from perl to sed for substitution of autoconf variables

- changed from generating reader.conf to vpcd in /etc/reader.conf.d


git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@329 96b47cad-a561-4643-ad3b-153ac7d7599c

virtualsmartcard/src/vpcd/Makefile.am

@@ -9,22 +9,22 @@ noinst_HEADERS = vpcd.h
 
 EXTRA_DIST = reader.conf.in
 
+
+do_subst = sed -e 's,[@]TARGET[@],$(serialdropdir)/$(VPCD_LIB),g'
+
+
 install: install_libvpcd
 
-install_libvpcd: libvpcd.la
+install_libvpcd: libvpcd.la reader.conf.in
 	$(mkinstalldirs) $(DESTDIR)$(serialdropdir)
 	$(LIBTOOL) --mode=install cp .libs/$(VPCD_LIB) $(DESTDIR)$(serialdropdir)/$(VPCD_LIB).$(VERSION)
 	ln -fs $(VPCD_LIB).$(VERSION) $(DESTDIR)$(serialdropdir)/$(VPCD_LIB)
-	if [ -e $(DESTDIR)$(sysconfdir)/reader.conf ] ; \
-	then \
-		echo "Edit existing /etc/reader.conf" ; \
-	else \
-		$(mkinstalldirs) $(DESTDIR)$(sysconfdir) ; \
-		perl -ne "s|TARGET|$(serialdropdir)/$(VPCD_LIB)| ; print" $(srcdir)/reader.conf.in > $(DESTDIR)$(sysconfdir)/reader.conf ; \
-	fi
+	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/reader.conf.d
+	$(do_subst) < $(srcdir)/reader.conf.in > $(DESTDIR)$(sysconfdir)/reader.conf.d/vpcd
 
 uninstall: uninstall_libvpcd
 
 uninstall_libvpcd:
 	rm -f $(DESTDIR)$(serialdropdir)/$(VPCD_LIB).$(VERSION) \
-	    $(DESTDIR)$(serialdropdir)/$(VPCD_LIB)
+	    $(DESTDIR)$(serialdropdir)/$(VPCD_LIB) \
+	    $(DESTDIR)$(sysconfdir)/reader.conf.d/vpcd

virtualsmartcard/src/vpcd/reader.conf.in

@@ -1,4 +1,4 @@
 FRIENDLYNAME "Virtual PCD"
 DEVICENAME   /dev/null
-LIBPATH      TARGET
+LIBPATH      @TARGET@
 CHANNELID    0x8C7B