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

	* login/Makefile (distribute): Remove xtmp.h.
This commit is contained in:
Ulrich Drepper 2000-06-13 20:46:12 +00:00
parent b8d36e834b
commit 5539d2574d
4 changed files with 12 additions and 6 deletions

View File

@ -1,5 +1,9 @@
2000-06-13 Ulrich Drepper <drepper@redhat.com> 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 * iconv/iconv_prog.c (main): Fix appending slashes if omit_invalid
is true. Reported by Bruno Haible <haible@ilog.fr>. is true. Reported by Bruno Haible <haible@ilog.fr>.

View File

@ -473,10 +473,12 @@ endif
override sources := $(addsuffix .c,\ override sources := $(addsuffix .c,\
$(filter-out $(elided-routines),\ $(filter-out $(elided-routines),\
$(routines) $(aux) \ $(routines) $(aux) \
$(sysdep_routines)) \ $(sysdep_routines)))
$(addprefix $(bppfx),\ # XXX The following was introduced here in the BP patches but it belongs
$(filter $(routines) $(sysdep_routines),\ # XXX somewhere else since adding it here breaks `make dist'.
$(bp-thunks)))) # $(addprefix $(bppfx),\
# $(filter $(routines) $(sysdep_routines),\
# $(bp-thunks))))
sysdep_routines := $(sysdep_routines) sysdep_routines := $(sysdep_routines)
headers := $(headers) $(sysdep_headers) headers := $(headers) $(sysdep_headers)

2
configure vendored
View File

@ -2128,7 +2128,7 @@ else
fi fi
for ac_prog in gawk mawk nawk awk for ac_prog in mawk gawk nawk awk
do do
# Extract the first word of "$ac_prog", so it can be a program name with args. # Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2 set dummy $ac_prog; ac_word=$2

View File

@ -32,7 +32,7 @@ CFLAGS-grantpt.c = -DLIBEXECDIR='"$(libexecdir)"'
others = utmpdump pt_chown others = utmpdump pt_chown
install-others = $(inst_libexecdir)/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 subdir-dirs = programs
vpath %.c programs vpath %.c programs