merge with 3.9t2

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 7cfb5b676bd8a312eefbff263378b8920bcb94e9..37c4df61ee58e0bdc26ea06aff86398f6f504fc9 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -31,7 +31,7 @@ exec_prefix = @exec_prefix@
 libdir = $(exec_prefix)/lib
 
 SOURCES = getdate.y posixtm.y \
-argmatch.c backupfile.c basename.c dirname.c eaccess.c \
+argmatch.c backupfile.c basename.c dirname.c euidaccess.c \
 error.c filemode.c fsusage.c full-write.c getopt.c getopt1.c \
 getversion.c group-member.c idcache.c isdir.c makepath.c \
 modechange.c mountlist.c obstack.c safe-read.c savedir.c \
@@ -61,7 +61,7 @@ all: libfu.a
 
 subdir = lib
 Makefile: ../config.status Makefile.in
-       cd ..; CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
+       cd .. && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
 
 installdirs:
 
@@ -151,7 +151,7 @@ getopt1.o: getopt.h
 modechange.o: modechange.h
 mountlist.o: mountlist.h
 xgetcwd.o: pathmax.h
-eaccess.o fsusage.o isdir.o makepath.o mkdir.o rename.o: safe-stat.h
+euidaccess.o fsusage.o isdir.o makepath.o mkdir.o rename.o: safe-stat.h
 
 # Tell versions [3.59,3.63) of GNU make not to export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.