* Makefile.tpl: Pass 'srcdir' to subconfigures correctly.

	* Makefile.in: Regenerate.

diff --git a/utils/ChangeLog b/utils/ChangeLog
index 4209c9c..a4d8926 100644 (file)
--- a/utils/ChangeLog
+++ b/utils/ChangeLog
@@ -2,6 +2,8 @@
 
        * configure.in: Pass 'srcdir' to subconfigures correctly.
        * configure: Regenerate.
+       * Makefile.tpl: Pass 'srcdir' to subconfigures correctly.
+       * Makefile.in: Regenerate.
 
 2002-05-28  Nick Clifton  <nickc@cambridge.redhat.com>
 

diff --git a/utils/Makefile.in b/utils/Makefile.in
index acb0e29..9c2cf80 100644 (file)
--- a/utils/Makefile.in
+++ b/utils/Makefile.in
@@ -191,18 +191,18 @@ maintainer-clean-wince: configure-wince
 configure-spu: spu/Makefile
 spu/Makefile: config.status
        test -d spu || mkdir spu ; \
-       cd spu && $(abs_srcdir)/spu/configure $(subconfigure_args)
+       cd spu && $(abs_srcdir)/spu/configure $(subconfigure_args)/spu
 .PHONY: configure-spu
 
 configure-sparclite: sparclite/Makefile
 sparclite/Makefile: config.status
        test -d sparclite || mkdir sparclite ; \
-       cd sparclite && $(abs_srcdir)/sparclite/configure $(subconfigure_args)
+       cd sparclite && $(abs_srcdir)/sparclite/configure $(subconfigure_args)/sparclite
 .PHONY: configure-sparclite
 
 configure-wince: wince/Makefile
 wince/Makefile: config.status
        test -d wince || mkdir wince ; \
-       cd wince && $(abs_srcdir)/wince/configure $(subconfigure_args)
+       cd wince && $(abs_srcdir)/wince/configure $(subconfigure_args)/wince
 .PHONY: configure-wince
 

diff --git a/utils/Makefile.tpl b/utils/Makefile.tpl
index 1375840..d02d6fb 100644 (file)
--- a/utils/Makefile.tpl
+++ b/utils/Makefile.tpl
@@ -126,6 +126,6 @@ FLAGS_TO_PASS = \
 configure-[+subdir+]: [+subdir+]/Makefile
 [+subdir+]/Makefile: config.status
        test -d [+subdir+] || mkdir [+subdir+] ; \
-       cd [+subdir+] && $(abs_srcdir)/[+subdir+]/configure $(subconfigure_args)
+       cd [+subdir+] && $(abs_srcdir)/[+subdir+]/configure $(subconfigure_args)/[+subdir+]
 .PHONY: configure-[+subdir+]
 [+ ENDFOR subdirs +]