4 files changed, 26 insertions, 18 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index 9bf7e3ccb3a..e0dad3de1f2 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,7 @@
+2007-07-29  Karl Berry  <karl@tug.org>
+
+	* depend.mk: regenerate again.
+
 2007-07-24  Karl Berry  <karl@tug.org>
 
 	* recorder.h (kpse_input, kpse_output): use const_string as
diff --git a/Build/source/texk/kpathsea/depend.mk b/Build/source/texk/kpathsea/depend.mk
index 629dd65adb7..5d0a2b14b22 100644
--- a/Build/source/texk/kpathsea/depend.mk
+++ b/Build/source/texk/kpathsea/depend.mk
@@ -31,7 +31,7 @@ access.o: access.c \
   $(kpathsea_srcdir)/types.h \
   $(kpathsea_srcdir)/lib.h \
   $(kpathsea_srcdir)/progname.h
-atou.lo: atou.c ../../../texk/kpathsea/config.h \
+atou.lo: atou.c config.h \
   $(kpathsea_dir)/c-auto.h $(kpathsea_srcdir)/c-std.h \
   $(kpathsea_srcdir)/c-unistd.h \
   $(kpathsea_srcdir)/systypes.h \
@@ -326,7 +326,7 @@ fontmap.lo: fontmap.c \
   $(kpathsea_srcdir)/recorder.h \
   $(kpathsea_srcdir)/tex-file.h \
   $(kpathsea_srcdir)/c-vararg.h
-getopt.lo: getopt.c ../../../texk/kpathsea/config.h \
+getopt.lo: getopt.c config.h \
   $(kpathsea_dir)/c-auto.h $(kpathsea_srcdir)/c-std.h \
   $(kpathsea_srcdir)/c-unistd.h \
   $(kpathsea_srcdir)/systypes.h \
@@ -696,7 +696,7 @@ strcasecmp.lo: strcasecmp.c \
   $(kpathsea_srcdir)/lib.h \
   $(kpathsea_srcdir)/progname.h
 strstr.lo: strstr.c
-strtol.lo: strtol.c ../../../texk/kpathsea/config.h \
+strtol.lo: strtol.c config.h \
   $(kpathsea_dir)/c-auto.h $(kpathsea_srcdir)/c-std.h \
   $(kpathsea_srcdir)/c-unistd.h \
   $(kpathsea_srcdir)/systypes.h \
diff --git a/Build/source/texk/make/ChangeLog b/Build/source/texk/make/ChangeLog
index 8527b521967..491b7f5e37e 100644
--- a/Build/source/texk/make/ChangeLog
+++ b/Build/source/texk/make/ChangeLog
@@ -1,3 +1,7 @@
+2007-07-29  Karl Berry  <karl@tug.org>
+
+	* rdepend.mk: replace all texk/kpathsea, not just first.
+
 2007-07-15  Karl Berry  <karl@tug.org>
 
 	* rdepend.mk: update for builddir != srcdir.
diff --git a/Build/source/texk/make/rdepend.mk b/Build/source/texk/make/rdepend.mk
index 1298c625b49..96ed99e11dc 100644
--- a/Build/source/texk/make/rdepend.mk
+++ b/Build/source/texk/make/rdepend.mk
@@ -2,7 +2,7 @@
 # $Id$
 @MAINT@# 
 @MAINT@# Have to use -M, not -MM, since we use <kpathsea/...> instead of
-@MAINT@# "kpathsea/..." in the sources.  But that means we have to remove the
+@MAINT@# "kpathsea/..." in the sources.	 But that means we have to remove the
 @MAINT@# directory prefixes and all the system include files.
 @MAINT@# And <kpathsea/paths.h> is generated, not part of the distribution.
 @MAINT@# We also remove any ../texk/kpathsea path component, since that comes
@@ -16,29 +16,29 @@
 @MAINT@endif
 @MAINT@
 @MAINT@depend depend.mk:: $(c_auto_h_dir)/c-auto.h \
-@MAINT@  $(top_srcdir)/../make/rdepend.mk 
+@MAINT@	 $(top_srcdir)/../make/rdepend.mk 
 @MAINT@	$(CC) -M $(ALL_CPPFLAGS) \
 @MAINT@		-I$(c_auto_h_dir) \
 @MAINT@		-I$(top_srcdir)/../../libs/libgsw32 \
 @MAINT@		$(srcdir)/*.c \
-@MAINT@	  | sed -e 's,\(\.\./\)\+texk/kpathsea/,,' \
-@MAINT@         -e 's,\(\.\./\)\+kpathsea/,$$(kpathsea_srcdir)/,g' \
-@MAINT@	        -e 's,$$(kpathsea_srcdir)/c-auto.h,$$(kpathsea_dir)/c-auto.h,g' \
-@MAINT@	        -e 's,$$(kpathsea_srcdir)/paths.h,$$(kpathsea_dir)/paths.h,g' \
-@MAINT@	        -e 's, /[^ ]*,,g' \
-@MAINT@	        -e 's, [^ ]*/\.\./libs/[^ ]*,,g' \
-@MAINT@	        -e 's, \./, ,g' \
-@MAINT@	        -e 's,dvi2xx.o,dvilj.o dvilj2p.o dvilj4.o dvilj4l.o,' \
-@MAINT@	        -e 's,lex.yy,$$(LEX_OUTPUT_ROOT),g' \
+@MAINT@	  | sed -e 's,\(\.\./\)\+texk/kpathsea/,,g' \
+@MAINT@		-e 's,\(\.\./\)\+kpathsea/,$$(kpathsea_srcdir)/,g' \
+@MAINT@		-e 's,$$(kpathsea_srcdir)/c-auto.h,$$(kpathsea_dir)/c-auto.h,g' \
+@MAINT@		-e 's,$$(kpathsea_srcdir)/paths.h,$$(kpathsea_dir)/paths.h,g' \
+@MAINT@		-e 's, /[^ ]*,,g' \
+@MAINT@		-e 's, [^ ]*/\.\./libs/[^ ]*,,g' \
+@MAINT@		-e 's, \./, ,g' \
+@MAINT@		-e 's,dvi2xx.o,dvilj.o dvilj2p.o dvilj4.o dvilj4l.o,' \
+@MAINT@		-e 's,lex.yy,$$(LEX_OUTPUT_ROOT),g' \
 @MAINT@	  | $(top_srcdir)/../unbackslsh.awk \
 @MAINT@	  >depend.mk
 @MAINT@# If kpathsea, we're making .lo library objects instead of .o's.
 @MAINT@	pwd | grep -v kpathsea >/dev/null \
 @MAINT@	  || (sed -e 's/\.o:/.lo:/' \
-@MAINT@	          -e 's/kpsewhich.lo:/kpsewhich.o:/' \
-@MAINT@	          -e 's/kpsestat.lo:/kpsestat.o:/' \
-@MAINT@	          -e 's/access.lo:/access.o:/' \
-@MAINT@	          -e 's/readlink.lo:/readlink.o:/' \
+@MAINT@		  -e 's/kpsewhich.lo:/kpsewhich.o:/' \
+@MAINT@		  -e 's/kpsestat.lo:/kpsestat.o:/' \
+@MAINT@		  -e 's/access.lo:/access.o:/' \
+@MAINT@		  -e 's/readlink.lo:/readlink.o:/' \
 @MAINT@	      <depend.mk >depend-tmp.mk; mv depend-tmp.mk depend.mk)
 @MAINT@.PHONY: depend