Merge branch 'tom_dev'

[exim.git] / src / OS / Makefile-GNU

diff --git a/src/OS/Makefile-GNU b/src/OS/Makefile-GNU
index d52fb22c9ee43ac8b945362310f0111f74f1423f..933256384779744d3afbdf9aa20e0e69cd2c2edc 100644 (file)
--- a/src/OS/Makefile-GNU
+++ b/src/OS/Makefile-GNU
@@ -1,17 +1,22 @@
-# $Cambridge: exim/src/OS/Makefile-GNU,v 1.1 2004/10/06 15:07:39 ph10 Exp $
+# $Cambridge: exim/src/OS/Makefile-GNU,v 1.5 2008/07/25 20:39:55 fanf2 Exp $
 
-# Exim: OS-specific make file for GNU/Hurd.
+# Exim: OS-specific make file for GNU and variants.
+
+HAVE_ICONV=yes
 
 BASENAME_COMMAND=look_for_it
+CHOWN_COMMAND=look_for_it
+CHGRP_COMMAND=look_for_it
+CHMOD_COMMAND=look_for_it
+
+CFLAGS ?= -O -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
 
 DBMLIB = -ldb
 USE_DB = yes
 
-LIBS = -lnsl -lcrypt
+LIBS = -lnsl -lcrypt -lm
 LIBRESOLV = -lresolv
 
-CFLAGS = -O2 -g -Wall
-
 X11=/usr/X11R6
 XINCLUDE=-I$(X11)/include
 XLFLAGS=-L$(X11)/lib
@@ -19,6 +24,8 @@ X11_LD_LIB=$(X11)/lib
 
 EXIWHAT_PS_ARG=ax
 EXIWHAT_EGREP_ARG='/exim( |$$)'
+EXIWHAT_MULTIKILL_CMD=killall
+EXIWHAT_MULTIKILL_ARG=exim
 EXIWHAT_KILL_SIGNAL=-USR1
 
 # End