From c8fcb5c36e5c0d6c7630446382412038e2662cb7 Mon Sep 17 00:00:00 2001 From: frankmorgner Date: Wed, 11 Apr 2012 18:49:34 +0000 Subject: [PATCH] use macro for sed im makefiles git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@755 96b47cad-a561-4643-ad3b-153ac7d7599c --- ccid/configure.ac | 1 + ccid/doc/Makefile.am | 2 +- ccid/src/Makefile.am | 2 +- npa/doc/Makefile.am | 2 +- npa/src/Makefile.am | 2 +- pcsc-relay/configure.ac | 1 + pcsc-relay/doc/Makefile.am | 2 +- pcsc-relay/src/Makefile.am | 2 +- virtualsmartcard/doc/Makefile.am | 2 +- 9 files changed, 9 insertions(+), 7 deletions(-) diff --git a/ccid/configure.ac b/ccid/configure.ac index f331df2..153e8b0 100644 --- a/ccid/configure.ac +++ b/ccid/configure.ac @@ -16,6 +16,7 @@ AC_PROG_INSTALL AC_PROG_LN_S AC_PROG_LIBTOOL AM_PROG_CC_C_O +AC_PROG_SED PKG_PROG_PKG_CONFIG AC_PATH_PROG(HELP2MAN, help2man, false // No help2man //) AC_PATH_PROG(GENGETOPT, gengetopt, false // No gengetopt //) diff --git a/ccid/doc/Makefile.am b/ccid/doc/Makefile.am index 9fc9aad..ece80c5 100644 --- a/ccid/doc/Makefile.am +++ b/ccid/doc/Makefile.am @@ -1,4 +1,4 @@ -do_subst = sed \ +do_subst = $(SED) \ -e 's,[@]PACKAGE[@],$(PACKAGE),g' \ -e 's,[@]PACKAGE_NAME[@],$(PACKAGE_NAME),g' \ -e 's,[@]PACKAGE_TARNAME[@],$(PACKAGE_TARNAME),g' \ diff --git a/ccid/src/Makefile.am b/ccid/src/Makefile.am index 25fdf96..7ee9b45 100644 --- a/ccid/src/Makefile.am +++ b/ccid/src/Makefile.am @@ -1,4 +1,4 @@ -do_subst = sed \ +do_subst = $(SED) \ -e 's,[@]PACKAGE[@],$(PACKAGE),g' \ -e 's,[@]PACKAGE_NAME[@],$(PACKAGE_NAME),g' \ -e 's,[@]PACKAGE_TARNAME[@],$(PACKAGE_TARNAME),g' \ diff --git a/npa/doc/Makefile.am b/npa/doc/Makefile.am index f25e105..fc1c31d 100644 --- a/npa/doc/Makefile.am +++ b/npa/doc/Makefile.am @@ -1,6 +1,6 @@ DOXYGEN ?= doxygen -do_subst = sed \ +do_subst = $(SED) \ -e 's,[@]PACKAGE[@],$(PACKAGE),g' \ -e 's,[@]PACKAGE_NAME[@],$(PACKAGE_NAME),g' \ -e 's,[@]PACKAGE_TARNAME[@],$(PACKAGE_TARNAME),g' \ diff --git a/npa/src/Makefile.am b/npa/src/Makefile.am index 90789a3..5c9314e 100644 --- a/npa/src/Makefile.am +++ b/npa/src/Makefile.am @@ -1,4 +1,4 @@ -do_subst = sed \ +do_subst = $(SED) \ -e 's,[@]PACKAGE[@],$(PACKAGE),g' \ -e 's,[@]PACKAGE_NAME[@],$(PACKAGE_NAME),g' \ -e 's,[@]PACKAGE_TARNAME[@],$(PACKAGE_TARNAME),g' \ diff --git a/pcsc-relay/configure.ac b/pcsc-relay/configure.ac index c8ada04..6d166b7 100644 --- a/pcsc-relay/configure.ac +++ b/pcsc-relay/configure.ac @@ -11,6 +11,7 @@ AM_INIT_AUTOMAKE AC_PROG_CC AM_PROG_CC_C_O AM_PATH_PYTHON +AC_PROG_SED PKG_PROG_PKG_CONFIG AC_PATH_PROG(HELP2MAN, help2man, false // No help2man //) AC_PATH_PROG(GENGETOPT, gengetopt, false // No gengetopt //) diff --git a/pcsc-relay/doc/Makefile.am b/pcsc-relay/doc/Makefile.am index c4320d7..8d88b88 100644 --- a/pcsc-relay/doc/Makefile.am +++ b/pcsc-relay/doc/Makefile.am @@ -1,4 +1,4 @@ -do_subst = sed \ +do_subst = $(SED) \ -e 's,[@]PACKAGE[@],$(PACKAGE),g' \ -e 's,[@]PACKAGE_NAME[@],$(PACKAGE_NAME),g' \ -e 's,[@]PACKAGE_TARNAME[@],$(PACKAGE_TARNAME),g' \ diff --git a/pcsc-relay/src/Makefile.am b/pcsc-relay/src/Makefile.am index a2d098e..3f25e7e 100644 --- a/pcsc-relay/src/Makefile.am +++ b/pcsc-relay/src/Makefile.am @@ -1,4 +1,4 @@ -do_subst = sed \ +do_subst = $(SED) \ -e 's,[@]PACKAGE[@],$(PACKAGE),g' \ -e 's,[@]PACKAGE_NAME[@],$(PACKAGE_NAME),g' \ -e 's,[@]PACKAGE_TARNAME[@],$(PACKAGE_TARNAME),g' \ diff --git a/virtualsmartcard/doc/Makefile.am b/virtualsmartcard/doc/Makefile.am index 77601cd..a96b626 100644 --- a/virtualsmartcard/doc/Makefile.am +++ b/virtualsmartcard/doc/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = api -do_subst = sed \ +do_subst = $(SED) \ -e 's,[@]PACKAGE_NAME[@],$(PACKAGE_NAME),g' \ -e 's,[@]PACKAGE_TARNAME[@],$(PACKAGE_TARNAME),g' \ -e 's,[@]PACKAGE_BUGREPORT[@],$(PACKAGE_BUGREPORT),g' \