File c_icap-0.3.2_libexec_handling.patch of Package c-icap

Index: c_icap-0.3.3/services/echo/Makefile.am
===================================================================
--- c_icap-0.3.3.orig/services/echo/Makefile.am
+++ c_icap-0.3.3/services/echo/Makefile.am
@@ -1,5 +1,5 @@
-
-pkglib_LTLIBRARIES=srv_echo.la
+c_icap_modulesdir=$(libexecdir)/c_icap
+c_icap_modules_LTLIBRARIES=srv_echo.la
 INCLUDES = -I$(top_srcdir)
 
 srv_echo_la_LIBADD = @MODULES_LIBADD@
Index: c_icap-0.3.3/services/ex-206/Makefile.am
===================================================================
--- c_icap-0.3.3.orig/services/ex-206/Makefile.am
+++ c_icap-0.3.3/services/ex-206/Makefile.am
@@ -1,5 +1,5 @@
-
-pkglib_LTLIBRARIES=srv_ex206.la
+c_icap_modulesdir=$(libexecdir)/c_icap
+c_icap_modules_LTLIBRARIES=srv_ex206.la
 INCLUDES = -I$(top_srcdir)
 
 srv_ex206_la_LIBADD = @MODULES_LIBADD@
Index: c_icap-0.3.3/modules/Makefile.am
===================================================================
--- c_icap-0.3.3.orig/modules/Makefile.am
+++ c_icap-0.3.3/modules/Makefile.am
@@ -1,18 +1,18 @@
 
 
 # lib_LTLIBRARIES=sys_logger.la perl_handler.la
-
-pkglib_LTLIBRARIES= sys_logger.la dnsbl_tables.la
+c_icap_modulesdir = $(libexecdir)/c_icap
+c_icap_modules_LTLIBRARIES= sys_logger.la dnsbl_tables.la
 if USEPERL
-pkglib_LTLIBRARIES += perl_handler.la
+c_icap_modules_LTLIBRARIES += perl_handler.la
 endif
 
 if USEBDB
-pkglib_LTLIBRARIES += bdb_tables.la
+c_icap_modules_LTLIBRARIES += bdb_tables.la
 endif
 
 if USELDAP
-pkglib_LTLIBRARIES += ldap_module.la
+c_icap_modules_LTLIBRARIES += ldap_module.la
 endif
 
 INCLUDES = -I$(top_srcdir)
Index: c_icap-0.3.3/c-icap-config.in
===================================================================
--- c_icap-0.3.3.orig/c-icap-config.in
+++ c_icap-0.3.3/c-icap-config.in
@@ -3,6 +3,7 @@
 prefix=@prefix@
 
 PKGLIBDIR=@PKGLIBDIR@/
+MODSDIR=@libexecdir@/@PACKAGE@/
 LIBDIR=@LIBDIR@/
 CONFIGDIR=@SYSCONFDIR@/
 DATADIR=@PKGDATADIR@/
@@ -56,7 +57,7 @@ case $1 in
        echo $CONFIGDIR;
        ;;
     '--modulesdir')
-       echo $PKGLIBDIR;
+       echo $MODSDIR;
        ;;
     '--version')
        echo $VERSION;
@@ -66,7 +67,7 @@ case $1 in
 	echo "c-icap version: "$VERSION;
         echo "c-icap installation prefix: "$prefix
 	echo "c-icap configuration directory: "$CONFIGDIR;
-	echo "c-icap modules/plugins directory: "$PKGLIBDIR;
+	echo "c-icap modules/plugins directory: "$MODSDIR;
 	echo "c-icap shared data directory: "$DATADIR;
 	echo ;
         echo "c-icap cflags for modules: "$CFLAGS;
Index: c_icap-0.3.3/c-icap-libicapapi-config.in
===================================================================
--- c_icap-0.3.3.orig/c-icap-libicapapi-config.in
+++ c_icap-0.3.3/c-icap-libicapapi-config.in
@@ -3,6 +3,7 @@
 prefix=@prefix@
 
 PKGLIBDIR=@PKGLIBDIR@/
+MODSDIR=@libexecdir@/@PACKAGE@/
 LIBDIR=@LIBDIR@/
 CONFIGDIR=@SYSCONFDIR@/
 DATADIR=@PKGDATADIR@/
Index: c_icap-0.3.3/Makefile.am
===================================================================
--- c_icap-0.3.3.orig/Makefile.am
+++ c_icap-0.3.3/Makefile.am
@@ -80,7 +80,8 @@ do_subst=sed -e 's%[@]SYSCONFDIR[@]%$(CO
              -e 's%[@]MODULES_LIBADD[@]%$(MODULES_LIBADD)%g' \
              -e 's%[@]MODULES_CFLAGS[@]%$(MODULES_CFLAGS)%g' \
              -e 's%[@]EXT_PROGRAMS_LIBADD[@]%$(EXT_PROGRAMS_MKLIB)%g' \
-             -e 's%[@]SOCKDIR[@]%$(SOCKDIR)%g'
+             -e 's%[@]SOCKDIR[@]%$(SOCKDIR)%g' \
+             -e 's%[@]libexecdir[@]%$(libexecdir)%g'
 
 CLEANFILES = c-icap-config c-icap-libicapapi-config