diff options
| author | Nigel Metheringham <nigel@exim.org> | 2009-11-19 18:58:44 +0000 |
|---|---|---|
| committer | Nigel Metheringham <nigel@exim.org> | 2009-11-19 18:58:44 +0000 |
| commit | d04744c2da9eb7296d4a4a2045fef1e677aef31f (patch) | |
| tree | fcf4394819126e6aff89daae82545e07ba72a1c7 /src | |
| parent | af056ccfd1c7ed8b329d95da5143131ec2f4c4d9 (diff) | |
Fixes for FreeBSD outside of ports. Fixes: #914
Diffstat (limited to 'src')
| -rw-r--r-- | src/OS/Makefile-FreeBSD | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/OS/Makefile-FreeBSD b/src/OS/Makefile-FreeBSD index 0abd8086f..c0f75ee78 100644 --- a/src/OS/Makefile-FreeBSD +++ b/src/OS/Makefile-FreeBSD @@ -1,4 +1,4 @@ -# $Cambridge: exim/src/OS/Makefile-FreeBSD,v 1.5 2008/07/25 20:39: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 @@ -18,14 +18,19 @@ 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 |