X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=config.mk.in;h=18d4f394c3d74b27b4349eeb96d4c6d350f69a7f;hp=299170fad35b6c488eb5c41878ce56fed4065786;hb=ba4a2465e10c1373c910d81606ca61f4fc87d90f;hpb=0a5fe82b6d5ab59bf3deeefb544b71e009e1e199

diff --git a/config.mk.in b/config.mk.in
index 299170f..18d4f39 100644
--- a/config.mk.in
+++ b/config.mk.in
@@ -29,6 +29,8 @@ MANGROUP	= root
 
 # Various libs
 LIBBSD		= @LIBBSD@
+LIBNSL		= @LIBNSL@
+LIBWRAP		= @LIBWRAP@
 
 ################# END OF USER SERVICEABLE PARTS ##################
 ALLTARGETS	= all clean distclean install installman \
@@ -41,13 +43,12 @@ ifndef ARCHFLAGS
 .EXPORT:	ARCHFLAGS
 endif
 
-CC		= @CC@
-AR		= ar
-LD		= ld
+AR		= @AR@
+LD		= @LD@
 RM		= rm -f
 MKDIR		= mkdir -p
 LN_S		= ln -sf
-RANLIB		= ranlib
+RANLIB		= @RANLIB@
 INDENT		= indent
 RPCGEN		= $(TOP)bin/rpcgen
 GETKVER		= $(TOP)tools/getkversion
@@ -60,7 +61,17 @@ ifdef KERNEL_INCDIR
 AFLAGS	       += -I$(KERNEL_INCDIR)
 endif
 
-CFLAGS		= @CFLAGS@ $(AFLAGS) $(CCOPTS) -DVERSION="\"$(VERSION)\""
+ALL-CFLAGS	= $(AFLAGS) $(CCOPTS) -DVERSION="\"$(VERSION)\""
+CC		= @CC@
+CFLAGS		= @CFLAGS@ $(ALL-CFLAGS)
+CC_FOR_BUILD	= @CC_FOR_BUILD@
+CFLAGS_FOR_BUILD= -O2 $(ALL-CFLAGS)
+
+ifdef BUILD
+CC		= $(CC_FOR_BUILD)
+CFLAGS		= $(CFLAGS_FOR_BUILD)
+endif
+
 LDFLAGS		= @LDFLAGS@ $(LDOPTS) -L$(TOP)support/lib
 
 ifdef NFSV3