Fix awk/sed wrapper paths

These wrappers are still necessary on non-GNU platforms; glibc
makefile rules invoke `sed' directly with GNU extensions.

Makefile.in

@@ -25,10 +25,10 @@ PATH := $(INSTALL_DIR)/bin:$(PATH)
 # gawk/gsed on platforms where these aren't the default), otherwise
 # don't override these as the wrappers don't always work.
 ifneq (@GSED@,/bin/sed)
-	PATH := $(base_dir)/sed:$(PATH)
+	PATH := $(builddir)/scripts/wrapper/sed:$(PATH)
 endif
 ifneq (@GAWK@,/usr/bin/gawk)
-	PATH := $(base_dir)/awk:$(PATH)
+	PATH := $(builddir)/scripts/wrapper/awk:$(PATH)
 endif
 
 export PATH AWK SED

configure

@@ -4557,8 +4557,8 @@ which seems to be undefined.  Please make sure it is defined" >&2;}
 
 
   case $ac_file$ac_mode in
-    "scripts/wrapper/awk/awk":F) chmod +x scripts/wrapper/awk ;;
-    "scripts/wrapper/sed/sed":F) chmod +x scripts/wrapper/sed ;;
+    "scripts/wrapper/awk/awk":F) chmod +x scripts/wrapper/awk/awk ;;
+    "scripts/wrapper/sed/sed":F) chmod +x scripts/wrapper/sed/sed ;;
 
   esac
 done # for ac_tag

configure.ac

@@ -127,8 +127,8 @@ AS_IF([test "x$with_cmodel" != x],
 	[AC_SUBST(cmodel, -mcmodel=medlow)])
 
 AC_CONFIG_FILES([Makefile])
-AC_CONFIG_FILES([scripts/wrapper/awk/awk], [chmod +x scripts/wrapper/awk])
-AC_CONFIG_FILES([scripts/wrapper/sed/sed], [chmod +x scripts/wrapper/sed])
+AC_CONFIG_FILES([scripts/wrapper/awk/awk], [chmod +x scripts/wrapper/awk/awk])
+AC_CONFIG_FILES([scripts/wrapper/sed/sed], [chmod +x scripts/wrapper/sed/sed])
 
 AC_ARG_WITH(host,
 	[AS_HELP_STRING([--with-host=x86_64-w64-mingw32],