--- src/cf/osconf.m4.old	2006-05-26 01:51:54.000000000 +0200
+++ src/cf/osconf.m4	2006-05-26 02:02:35.000000000 +0200
@@ -2,11 +2,11 @@
 AC_DEFUN([OPENAFS_OSCONF], [
 
 dnl defaults, override in case below as needed
-XCFLAGS='${DBG} ${OPTMZ}'
+dnl XCFLAGS='${DBG} ${OPTMZ}'
 SHLIB_SUFFIX="so"
-CC="cc"
-CCOBJ="cc"
-MT_CC="cc"
+dnl CC="cc"
+CCOBJ="${CC}"
+MT_CC="${CC}"
 XLIBS="${LIB_AFSDB}"
 
 dnl debugging and optimization flag defaults
--- src/pam/Makefile.in.old	2005-07-21 15:42:28.000000000 +0200
+++ src/pam/Makefile.in	2005-07-21 15:51:30.000000000 +0200
@@ -25,7 +25,7 @@
 	  afs_pam_msg.o afs_message.o AFS_component_version_number.o
    OBJS = $(SHOBJS) test_pam.o
 INCLUDES=-I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} 
-CFLAGS =  ${DEBUG} ${INCLUDES} ${PAM_CFLAGS}
+CFLAGS =  ${DEBUG} ${INCLUDES} ${PAM_CFLAGS} -DBINDIR='"${bindir}"'
 
 all: test_pam ${TOP_LIBDIR}/pam_afs.so.1 ${TOP_LIBDIR}/pam_afs.krb.so.1
 
--- src/pam/afs_util.h.old	2005-07-21 15:41:06.000000000 +0200
+++ src/pam/afs_util.h	2005-07-21 15:50:39.000000000 +0200
@@ -24,9 +24,9 @@
 		   const char *lifetime, const char *cell_name);
 extern afs_int32 getPAG(void);
 
-#define KLOG "/usr/afsws/bin/klog"
-#define KLOGKRB "/usr/afsws/bin/klog.krb"
-#define UNLOG "/usr/afsws/bin/unlog"
+#define KLOG BINDIR "/klog"
+#define KLOGKRB BINDIR "/klog.krb"
+#define UNLOG BINDIR "/unlog"
 #define IGNORE_MAX 1000
 
 #if	defined(AFS_HPUX_ENV)
--- acinclude.m4.old	2006-05-26 01:56:35.000000000 +0200
+++ acinclude.m4	2006-05-26 01:56:36.000000000 +0200
@@ -498,7 +498,7 @@
 			;;
 		x86_64-*-linux-gnu)
 			AFS_SYSNAME="amd64_linuxXX"
-			enable_pam="no"
+			enable_pam="yes"
 			;;
 		*)
 			AC_MSG_ERROR(An AFS sysname is required)
--- src/util/dirpath.c.old	2005-08-19 09:04:36.000000000 +0200
+++ src/util/dirpath.c	2005-08-19 09:04:38.000000000 +0200
@@ -641,7 +641,7 @@
 int
 ConstructLocalBinPath(const char *cpath, char **fullPathBufp)
 {
-    return ConstructLocalPath(cpath, AFSDIR_CANONICAL_SERVER_BIN_DIRPATH,
+    return ConstructLocalPath(cpath, AFSDIR_SERVER_BIN_DIRPATH,
 			      fullPathBufp);
 }
 
@@ -654,6 +654,6 @@
 int
 ConstructLocalLogPath(const char *cpath, char **fullPathBufp)
 {
-    return ConstructLocalPath(cpath, AFSDIR_CANONICAL_SERVER_LOGS_DIRPATH,
+    return ConstructLocalPath(cpath, AFSDIR_SERVER_LOGS_DIRPATH,
 			      fullPathBufp);
 }
--- src/venus/fs.c.old	2007-01-10 19:45:29.000000000 +0100
+++ src/venus/fs.c	2007-01-10 19:45:35.000000000 +0100
@@ -54,6 +54,7 @@
 #include <stdlib.h>
 #include <assert.h>
 #include <afs/ptclient.h>
+#include <afs/com_err.h>
 
 
 #define	MAXHOSTS 13
--- src/comerr/Makefile.in	2004-12-07 07:08:45.000000000 +0100
+++ src/comerr/Makefile.in	2007-07-24 21:02:38.000000000 +0200
@@ -28,7 +28,7 @@
 #
 # Installation targets
 #
-install:  ${DESTDIR}${bindir}/compile_et ${DESTDIR}${includedir}/afs/com_err.h ${DESTDIR}${includedir}/afs/error_table.h ${DESTDIR}${includedir}/afs/mit-sipb-cr.h ${DESTDIR}${libdir}/afs/libcom_err.a
+install:  ${DESTDIR}${includedir}/afs/com_err.h ${DESTDIR}${includedir}/afs/error_table.h ${DESTDIR}${includedir}/afs/mit-sipb-cr.h ${DESTDIR}${libdir}/afs/libcom_err.a
 
 ${DEST}/bin/compile_et: compile_et
 	${INSTALL} $? $@