MSYS ships an obsolete version of GNU make which doesn't grok

order-only prerequisites.  They were used to make directories
info.html, info.nr, lib.  Make them ahead of time, in configure.  Also
fixes distclean not removing them.

diff --git a/Make.mk b/Make.mk
index c7d3ddbc25cadf15590da74b9b442a99eb0e0d12..00e30a2fc18a3d03e45c78f8cd4d1ccc9e1006ec 100644 (file)
--- a/Make.mk
+++ b/Make.mk
@@ -86,7 +86,7 @@ subst.in = sed \
 # See `Cleanliness' below
 # sources.mk subjects.mk
 # Generated by Autoconf, not distributed:
-ac := config.h config.log config.status stamp-h
+ac := config.h config.log config.status info.html info.nr lib stamp-h
 ac += $(basename $(filter %.in, $(src)))
 ac += $(srcdir)/autom4te.cache $(srcdir)/src/client/autom4te.cache
 # distributed by dist-source from $(srcdir):
@@ -174,7 +174,7 @@ install: all installdirs
        $(INSTALL_DATA) $(info.nr) $(einfodir)
        $(INSTALL_DATA) $(addprefix $(srcdir)/, $(man1)) $(mandir)/man1
        $(INSTALL_DATA) $(addprefix $(srcdir)/, $(man6)) $(mandir)/man6
-       if test -e $(econfig); then                                     \
+       if [ -e $(econfig) ]; then                                      \
            if src/util/pconfig $(econfig) >$(econfig).new; then        \
                if cmp -s $(econfig) $(econfig).new; then               \
                    rm $(econfig).new;                                  \
@@ -193,7 +193,8 @@ installdirs:
        mkdir -p $(sbindir) $(bindir) $(builtindir) $(einfodir) $(mandir)/man1 $(mandir)/man6 $(dir $(econfig)) $(gamedir)
 
 .PHONY: install-html
-install-html: html | $(ehtmldir)
+install-html: html
+       mkdir -p $(ehtmldir)
        $(INSTALL_DATA) $(info.html) $(ehtmldir)
 
 .PHONY: uninstall
@@ -257,7 +258,7 @@ lib/libgen.a: $(filter src/lib/gen/%, $(obj))
 lib/libglobal.a: $(filter src/lib/global/%, $(obj))
 lib/liblwp.a: $(filter src/lib/lwp/%, $(obj))
 
-$(libs) $(empth_lib): | lib
+$(libs) $(empth_lib):
        $(AR) rc $@ $?
        $(RANLIB) $@
 
@@ -284,13 +285,10 @@ info.html/all.html: $(filter-out info.html/all.html, $(info.html)) info/ls2html.
        (cd info.html && ls -C $(notdir $(info.html))) | expand | perl $(filter %.pl, $^) >$@
 # FIXME shouldn't use ls
 
-$(info.nr): info/CRT.MAC info/INFO.MAC info/Blank.awk | info.nr
+$(info.nr): info/CRT.MAC info/INFO.MAC info/Blank.awk
 
-$(subjects.html) info.html/TOP.html: info/subj2html.pl | info.html
-$(topics.html): info/emp2html.pl | info.html
-
-info.nr info.html lib:
-       mkdir -p $@
+$(subjects.html) info.html/TOP.html: info/subj2html.pl
+$(topics.html): info/emp2html.pl
 
 ifeq ($(cvs_controlled),yes)
 # Find files and directories under CVS control

diff --git a/configure.ac b/configure.ac
index 46811a0cdb06ef52b3e5f6f74a3aa389c5e81d85..040730cf025b912f7886d209df0a7dddb9a58ec2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -146,6 +146,7 @@ AC_CONFIG_COMMANDS([stamp-h],
            mkdir -p `sed s/.*=// <$srcdir/sources.mk | tr ' ' '\012' \
                | sed -n '/\//s,/@<:@^/@:>@*$,,gp'| uniq`
        fi
+       mkdir -p info.html info.nr lib
        >stamp-h],
        [cvs_controlled=$cvs_controlled; AWK=$AWK])
 AC_OUTPUT