From dcb2507b2fb1c16ffb5d49c527f1689d5806d4c6 Mon Sep 17 00:00:00 2001
From: frankmorgner <frankmorgner@96b47cad-a561-4643-ad3b-153ac7d7599c>
Date: Wed, 13 Oct 2010 19:18:40 +0000
Subject: [PATCH] - 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/configure.ac                  |  7 ++++---
 virtualsmartcard/src/vpcd/Makefile.am          | 18 +++++++++---------
 virtualsmartcard/src/vpcd/reader.conf.in       |  2 +-
 virtualsmartcard/src/vpicc/Makefile.am         | 15 ++++++---------
 virtualsmartcard/src/vpicc/vicc.in             |  2 +-
 virtualsmartcard/src/vpicc/virtualsmartcard.in |  4 ----
 6 files changed, 21 insertions(+), 27 deletions(-)
 delete mode 100644 virtualsmartcard/src/vpicc/virtualsmartcard.in

diff --git a/virtualsmartcard/configure.ac b/virtualsmartcard/configure.ac
index 867c83e..efc028a 100644
--- a/virtualsmartcard/configure.ac
+++ b/virtualsmartcard/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.64])
-AC_INIT([virtualsmartcard], [0.2], [morgner@informatik.hu-berlin.de])
+AC_INIT([virtualsmartcard], [0.2], [http://sourceforge.net/projects/vsmartcard/support])
 AC_CONFIG_SRCDIR([src/vpcd/ifd.c])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
@@ -90,7 +90,7 @@ esac
 
 cat << EOF
 
-virtualsmartcard has been configured with following options:
+${PACKAGE} has been configured with following options:
 
 Version:              ${PACKAGE_VERSION}
 User binaries:        $(eval eval eval echo "${bindir}")
@@ -116,5 +116,6 @@ EOF
 AC_CONFIG_FILES([Makefile
                  src/Makefile
                  src/vpcd/Makefile
-                 src/vpicc/Makefile])
+                 src/vpicc/Makefile
+                 ])
 AC_OUTPUT
diff --git a/virtualsmartcard/src/vpcd/Makefile.am b/virtualsmartcard/src/vpcd/Makefile.am
index 5630cea..6ffec43 100644
--- a/virtualsmartcard/src/vpcd/Makefile.am
+++ b/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
diff --git a/virtualsmartcard/src/vpcd/reader.conf.in b/virtualsmartcard/src/vpcd/reader.conf.in
index 6c6c699..4c91906 100644
--- a/virtualsmartcard/src/vpcd/reader.conf.in
+++ b/virtualsmartcard/src/vpcd/reader.conf.in
@@ -1,4 +1,4 @@
 FRIENDLYNAME "Virtual PCD"
 DEVICENAME   /dev/null
-LIBPATH      TARGET
+LIBPATH      @TARGET@
 CHANNELID    0x8C7B
diff --git a/virtualsmartcard/src/vpicc/Makefile.am b/virtualsmartcard/src/vpicc/Makefile.am
index fbc4545..23bcf4a 100644
--- a/virtualsmartcard/src/vpicc/Makefile.am
+++ b/virtualsmartcard/src/vpicc/Makefile.am
@@ -1,3 +1,5 @@
+bin_SCRIPTS = vicc
+CLEANFILES = $(bin_SCRIPTS)
 EXTRA_DIST = vicc.in
 
 vpiccdir = $(pythondir)/virtualsmartcard
@@ -14,13 +16,8 @@ vpicc_PYTHON = virtualsmartcard/CardGenerator.py \
 	       virtualsmartcard/VirtualSmartcard.py \
 	       virtualsmartcard/__init__.py
 
-all-local:
-	perl -ne "s|PYTHONBIN|$(PYTHON)| ; print" vicc.in > vicc
-	$(mkinstalldirs) $(DESTDIR)$(bindir)
-	$(INSTALL_SCRIPT) vicc $(DESTDIR)$(bindir)/vicc
+do_subst = sed -e 's,[@]PYTHON[@],$(PYTHON),g'
 
-uninstall-local:
-	rm -f $(DESTDIR)$(bindir)/vicc
-
-clean-local:
-	rm -f vicc
+vicc: vicc.in Makefile
+	$(do_subst) < $(srcdir)/vicc.in > vicc
+	chmod +x vicc
diff --git a/virtualsmartcard/src/vpicc/vicc.in b/virtualsmartcard/src/vpicc/vicc.in
index b888481..e7ef65d 100644
--- a/virtualsmartcard/src/vpicc/vicc.in
+++ b/virtualsmartcard/src/vpicc/vicc.in
@@ -1,4 +1,4 @@
-#! PYTHONBIN
+#! @PYTHON@
 #
 #
 # Copyright (C) 2009 Frank Morgner, Dominik Oepen
diff --git a/virtualsmartcard/src/vpicc/virtualsmartcard.in b/virtualsmartcard/src/vpicc/virtualsmartcard.in
deleted file mode 100644
index 1c80d67..0000000
--- a/virtualsmartcard/src/vpicc/virtualsmartcard.in
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-cd "PYTHONDIR"
-PYTHONBIN "PYTHONDIR/VirtualSmartcard.py" "$@"