diff -Nru vmailmgr-0.97.orig/authenticate/Makefile.am vmailmgr-0.97/authenticate/Makefile.am --- vmailmgr-0.97.orig/authenticate/Makefile.am 2008-06-23 00:06:53.000000000 +0200 +++ vmailmgr-0.97/authenticate/Makefile.am 2008-06-23 00:04:28.000000000 +0200 @@ -1,6 +1,4 @@ bin_PROGRAMS = checkvpw vauthenticate -authlib_PROGRAMS = authvmailmgr -authlibdir = ${prefix}/lib/courier-imap/libexec/authlib/ noinst_PODS = checkvpw.pod vauthenticate.pod noinst_HTMLS = $(noinst_PODS:.pod=.html) @@ -25,8 +23,5 @@ checkvpw_SOURCES = checkvpw.cc authvlib.cc authvlib.h checkvpw_LDADD = ../lib/libvmailmgr.a -authvmailmgr_SOURCES = authvmailmgr.cc authvlib.cc authvlib.h -authvmailmgr_LDADD = ../lib/libvmailmgr.a -L../lib/courier-authlib -lauthmod - vauthenticate_SOURCES = vauthenticate.cc authvlib.cc authvlib.h vauthenticate_LDADD = ../lib/libvmailmgr.a diff -Nru vmailmgr-0.97.orig/configure.in vmailmgr-0.97/configure.in --- vmailmgr-0.97.orig/configure.in 2008-06-23 00:06:53.000000000 +0200 +++ vmailmgr-0.97/configure.in 2008-06-23 00:04:28.000000000 +0200 @@ -62,7 +62,7 @@ AC_SUBST(pythonlibdir) AM_CONDITIONAL(WANTPYTHON, test x$local_cv_python_lib_dir != xNONE) -phpdir="/home/httpd/php" +phpdir="${libdir}/php" AC_SUBST(phpdir) AC_PATH_PROG(W3M, w3m) @@ -113,7 +113,7 @@ AC_CHECK_FUNCS(gethostname gettimeofday mkdir putenv rmdir socket) AC_CHECK_FUNCS(srandom random crypt) -cgidir='${prefix}/cgi-bin' +cgidir='/var/www/localhost/cgi-bin' AC_SUBST(cgidir) AC_OUTPUT(Makefile diff -Nru vmailmgr-0.97.orig/lib/Makefile.am vmailmgr-0.97/lib/Makefile.am --- vmailmgr-0.97.orig/lib/Makefile.am 2008-06-23 00:06:53.000000000 +0200 +++ vmailmgr-0.97/lib/Makefile.am 2008-06-23 00:04:28.000000000 +0200 @@ -1,5 +1,4 @@ -SUBDIRS = misc vdomain vpwentry vpwtable cdb++ cgi cli++ fdbuf mystring config \ - courier-authlib +SUBDIRS = misc vdomain vpwentry vpwtable cdb++ cgi cli++ fdbuf mystring config noinst_LIBRARIES = libvmailmgr.a libcgi.a libcli.a EXTRA_DIST = mergelib.sh diff -Nru vmailmgr-0.97.orig/Makefile.am vmailmgr-0.97/Makefile.am --- vmailmgr-0.97.orig/Makefile.am 2008-06-23 00:06:53.000000000 +0200 +++ vmailmgr-0.97/Makefile.am 2008-06-23 00:07:07.000000000 +0200 @@ -1,7 +1,7 @@ if WANTPYTHON -SUBDIRS = python php lib authenticate commands daemon cgi doc scripts +SUBDIRS = python php lib authenticate commands daemon cgi scripts else -SUBDIRS = php lib authenticate commands daemon cgi doc scripts +SUBDIRS = php lib authenticate commands daemon cgi scripts endif dist-hook: