diff --git a/build/top.mk b/build/top.mk
index be65c41ba0..5eb1af16c1 100644
--- a/build/top.mk
+++ b/build/top.mk
@@ -34,19 +34,14 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@/$(ldap_subdir)
 
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 
-MV = mv
-LN = ln
-LN_S = @LN_S@
-RM = rm -f
-MAKEINFO = @MAKEINFO@
-RANLIB = @RANLIB@
-AR = ar
-
 LINT = lint
 5LINT = 5lint
 MKDEP = $(top_srcdir)/build/mkdep $(MKDEPFLAG) -d "$(srcdir)" -c "$(CC)"
@@ -56,15 +51,23 @@ LIBVERSION = 0:0:0
 LTLINK  = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $(LTVERSION)
 LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL) 
 
-# Misc UNIX commands used in makefiles
-SED = sed
+# Misc UNIX commands used in build environment
+AR = ar
+AWK = @AWK@
+BASENAME = basename
+CAT = cat
+CHMOD = chmod
 DATE = date
 HOSTNAME = uname -n
-BASENAME = basename
-PWD = pwd
-CAT = cat
+LN = ln
+LN_S = @LN_S@
+MAKEINFO = @MAKEINFO@
 MKDIR = mkdir -p
-CHMOD = chmod
+MV = mv
+PWD = pwd
+RANLIB = @RANLIB@
+RM = rm -f
+SED = sed
 
 # Misc UNIX commands used in programs
 EDITOR = @EDITOR@