X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=config.mk.in;h=18d4f394c3d74b27b4349eeb96d4c6d350f69a7f;hp=76ade0145a4c10579fe752cc872fe6647559fc4a;hb=7a1b307cfbdbb2364274252b21094d9f2207342b;hpb=a316a1c4eb798c9be3ef64ab02a5421fcc8b6c5e

diff --git a/config.mk.in b/config.mk.in
index 76ade01..18d4f39 100644
--- a/config.mk.in
+++ b/config.mk.in
@@ -2,7 +2,7 @@
 # Configuration stuff for nfs-utils
 #
 
-VERSION		= @VERSION@
+VERSION		= nfs-utils @VERSION@
 
 prefix		= $(install_prefix)@prefix@
 exec_prefix	= $(install_prefix)@prefix@
@@ -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
@@ -69,8 +80,9 @@ endif
 
 k		= $(KPREFIX)
 
+INSTALLSCRIPT	= $(INSTALL) -m 755
 INSTALLBIN	= $(INSTALL) -m 755 -s
-INSTALLSUID	= $(INSTALL) -m 4755
+INSTALLSUID	= $(INSTALL) -m 4755 -s
 INSTALLMOD	= $(INSTALL) -m 600
 INSTALLMAN	= $(INSTALL) -m 644
 MAN1DIR		= $(MANDIR)/man$(MAN1EXT)