Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work


netware/Makefile.am:
  Auto merged

netware/Makefile.am

@@ -57,7 +57,7 @@ DISTCLEANFILES =                $(BUILT_SOURCES)
 
 # Create the libmysql.imp from libmysql/libmysql.def
 libmysql.imp: $(top_srcdir)/libmysql/libmysql.def
-	awk 'BEGIN{x=0;} \
+	$(AWK) 'BEGIN{x=0;} \
              END{printf("\n");} \
              x==1 {printf(" %s",$$1); x++; next} \
              x>1 {printf(",\n %s", $$1); next} \