Update.

	* Makerules (sources): Don't add BP sources here.

	* login/Makefile (distribute): Remove xtmp.h.

4 files changed, 12 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 8b042fc356..af6a7d394f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2000-06-13  Ulrich Drepper  <drepper@redhat.com>
 
+	* Makerules (sources): Don't add BP sources here.
+
+	* login/Makefile (distribute): Remove xtmp.h.
+
 	* iconv/iconv_prog.c (main): Fix appending slashes if omit_invalid
 	is true.  Reported by Bruno Haible <haible@ilog.fr>.
 
diff --git a/Makerules b/Makerules
index f334c8c171..7ea9783d0d 100644
--- a/Makerules
+++ b/Makerules
@@ -473,10 +473,12 @@ endif
 override sources := $(addsuffix .c,\
 			$(filter-out $(elided-routines),\
 			    $(routines) $(aux) \
-			    $(sysdep_routines)) \
-			    $(addprefix $(bppfx),\
-				$(filter $(routines) $(sysdep_routines),\
-				    $(bp-thunks))))
+			    $(sysdep_routines)))
+# XXX The following was introduced here in the BP patches but it belongs
+# XXX somewhere else since adding it here breaks `make dist'.
+#			    $(addprefix $(bppfx),\
+#				$(filter $(routines) $(sysdep_routines),\
+#				    $(bp-thunks))))
 sysdep_routines := $(sysdep_routines)
 
 headers := $(headers) $(sysdep_headers)
diff --git a/configure b/configure
index 04f41157af..e37adeea46 100755
--- a/configure
+++ b/configure
@@ -2128,7 +2128,7 @@ else
 fi
 
 
-for ac_prog in gawk mawk nawk awk
+for ac_prog in mawk gawk nawk awk
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
diff --git a/login/Makefile b/login/Makefile
index 475b2cec29..942e47efb4 100644
--- a/login/Makefile
+++ b/login/Makefile
@@ -32,7 +32,7 @@ CFLAGS-grantpt.c = -DLIBEXECDIR='"$(libexecdir)"'
 others = utmpdump pt_chown
 install-others = $(inst_libexecdir)/pt_chown
 
-distribute := utmp-private.h programs/xtmp.h pty-private.h
+distribute := utmp-private.h pty-private.h
 
 subdir-dirs = programs
 vpath %.c programs