Bug fix for yesterday's change, which worked in a production system

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

diff --git a/src/OS/Makefile-FreeBSD b/src/OS/Makefile-FreeBSD
index 0527e8be45f50c9a74aa8ac5a5f6a19a17577f4b..c0f75ee78efb5d78e66e602772b7b284a84b9d97 100644 (file)
--- a/src/OS/Makefile-FreeBSD
+++ b/src/OS/Makefile-FreeBSD
@@ -1,4 +1,4 @@
-# $Cambridge: exim/src/OS/Makefile-FreeBSD,v 1.2 2005/05/23 16:58:55 fanf2 Exp $
+# $Cambridge: exim/src/OS/Makefile-FreeBSD,v 1.6 2009/11/19 18:58:44 nm4 Exp $
 
 # Exim: OS-specific make file for FreeBSD
 # There's no setting of CFLAGS here, to allow the system default
@@ -7,23 +7,30 @@
 PORTOBJFORMAT!= test -x /usr/bin/objformat && /usr/bin/objformat || echo aout
 
 CHOWN_COMMAND=/usr/sbin/chown
+STRIP_COMMAND=/usr/bin/strip
+CHMOD_COMMAND=/bin/chmod
 
 HAVE_SA_LEN=YES
 
 # crypt() is in a separate library
-LIBS=-lcrypt -lm
+LIBS=-lcrypt -lm -lutil
 
 # FreeBSD always ships with Berkeley DB
 USE_DB=yes
 
-# This setting changed on Sheldon Hearn's recommendation
-# X11=/usr/X11R6
-X11=$(X11BASE)
+# This code for building outside ports suggested by Richard Clayton
+.ifdef   X11BASE
+X11=${X11BASE}
+.elifdef LOCALBASE
+X11=$(LOCALBASE)
+.else
+X11=/usr/local
+.endif
 
 XINCLUDE=-I$(X11)/include
 XLFLAGS=-L$(X11)/lib
 .if ${PORTOBJFORMAT} == "elf"
-XLFLAGS+=-Wl,-rpath,${X11BASE}/lib
+XLFLAGS+=-Wl,-rpath,${X11}/lib
 .endif
 X11_LD_LIB=$(X11)/lib