--- /dev/null
+--- xmail-1.24.orig/Makefile.common 2006-12-31 20:03:59.000000000 +0100
++++ xmail-1.24/Makefile.common 2007-02-01 20:41:08.000000000 +0100
+@@ -76,15 +76,15 @@
+ SENDMAILOBJS = SendMail.o
+
+ %.o : %.cpp
+- ${CC} ${CPPFLAGS} ${CFLAGS} -c $*.cpp
++ ${CXX} ${CPPFLAGS} ${CFLAGS} -c $*.cpp
+
+ all: ${OUTDIR} ${MKMACHDEPINC} ${MAILSVR} ${CRTLCLNT} ${XMCRYPT} ${MKUSERS} ${SENDMAIL}
+
+ ${OUTDIR}:
+ @mkdir ${OUTDIR}
+
+-${MKMACHDEPINC}: ${MKMACHDEP}
+- ./${MKMACHDEP} > ${MKMACHDEPINC}
++#${MKMACHDEPINC}: ${MKMACHDEP}
++# ./${MKMACHDEP} > ${MKMACHDEPINC}
+
+ ${MKMACHDEP}: ${MKMACHDEPOBJS}
+ ${LD} -o ${MKMACHDEP} ${MKMACHDEPOBJS} ${LDFLAGS}