* Some DOS fixes.

diff --git a/ChangeLog b/ChangeLog
index 14f2c6d1042d272cff03e9e650fbc92ec0b34af8..1d194b5e829a34f014cc1c28c47c240efa87ab2e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+1999-08-09  Paul D. Smith  <psmith@gnu.org>
+
+       * maintMakefile: Use g in sed (s///g) to replace >1 variable per
+       line.
+
+       * Makefile.DOS.template: Fix mostlyclean-aminfo to remove the
+       right stuff.
+
+1999-08-01  Eli Zaretskii  <eliz@is.elta.co.il>
+
+       * function.c (msdos_openpipe): *Really* return a FILE ptr.
+
 1999-08-01  Paul D. Smith  <psmith@gnu.org>
 
        New jobserver algorithm to avoid a possible hole where we could

diff --git a/Makefile.DOS.template b/Makefile.DOS.template
index b90577e4b048bfeb2c36a0dafa6bb8f944591752..7e224013a404a04b34d3a35c45de474b3b4f6f70 100644 (file)
--- a/Makefile.DOS.template
+++ b/Makefile.DOS.template
@@ -224,7 +224,9 @@ dist-info: $(INFO_DEPS)
        for base in $(INFO_DEPS); do    d=$(srcdir);    for file in `cd $$d && eval echo $$base*`; do      test -f $(distdir)/$$file      || ln $$d/$$file $(distdir)/$$file 2> /dev/null      || cp -p $$d/$$file $(distdir)/$$file;    done;  done
 
 mostlyclean-aminfo:
-       cd $(srcdir) && for i in $(INFO_DEPS) make.i; do rm -f `eval echo $$i*`; done
+       -rm -f make.aux make.cp make.cps make.dvi make.fn make.fns make.ky \
+         make.kys make.ps make.log make.pg make.toc make.tp make.tps \
+         make.vr make.vrs make.op make.tr make.cv make.cn
 
 clean-aminfo:
 

diff --git a/function.c b/function.c
index 4047339f13477cae01e0a6a4e18659fbf7b01563..ca115fe14c0fe322d29ce3c8cb487796b2a795f0 100644 (file)
--- a/function.c
+++ b/function.c
@@ -1203,7 +1203,7 @@ windows32_openpipe (int *pipedes, int *pid_p, char **command_argv, char **envp)
 
 
 #ifdef __MSDOS__
-int
+FILE *
 msdos_openpipe (int* pipedes, int *pidp, char *text)
 {
   FILE *fpipe=0;

diff --git a/maintMakefile b/maintMakefile
index 50fc396af27f5d5bd8514d9280e02348c60c1463..c95371785116f59df73bdb15e92b70d091742fa0 100644 (file)
--- a/maintMakefile
+++ b/maintMakefile
@@ -20,8 +20,8 @@ MTEMPLATES = Makefile.DOS SMakefile
 #
 $(TEMPLATES) : % : %.template configure.in
        rm -f $@
-       sed -e 's@%VERSION%@$(VERSION)@' \
-           -e 's@%PACKAGE%@$(PACKAGE)@' \
+       sed -e 's@%VERSION%@$(VERSION)@g' \
+           -e 's@%PACKAGE%@$(PACKAGE)@g' \
          $< > $@
        chmod a-w $@
 
@@ -29,12 +29,12 @@ $(TEMPLATES) : % : %.template configure.in
 #
 $(MTEMPLATES) : % : %.template .dep_segment Makefile.am maintMakefile
        rm -f $@
-       sed -e 's@%VERSION%@$(VERSION)@' \
-           -e 's@%PROGRAMS%@$(bin_PROGRAMS)@' \
-           -e 's@%SOURCES%@$(filter-out remote-%,$(make_SOURCES)) remote-$$(REMOTE).c@' \
-           -e 's@%OBJECTS%@$(filter-out remote-%,$(make_OBJECTS)) remote-$$(REMOTE).o@' \
-           -e 's@%GLOB_SOURCES%@$(globsrc) $(globhdr)@' \
-           -e 's@%GLOB_OBJECTS%@$(globsrc:glob/%.c=%.o)@' \
+       sed -e 's@%VERSION%@$(VERSION)@g' \
+           -e 's@%PROGRAMS%@$(bin_PROGRAMS)@g' \
+           -e 's@%SOURCES%@$(filter-out remote-%,$(make_SOURCES)) remote-$$(REMOTE).c@g' \
+           -e 's@%OBJECTS%@$(filter-out remote-%,$(make_OBJECTS)) remote-$$(REMOTE).o@g' \
+           -e 's@%GLOB_SOURCES%@$(globsrc) $(globhdr)@g' \
+           -e 's@%GLOB_OBJECTS%@$(globsrc:glob/%.c=%.o)@g' \
          $< > $@
        echo >>$@; echo '# --------------- DEPENDENCIES' >>$@; echo '#' >>$@; \
          cat $(word 2,$^) >>$@
@@ -51,8 +51,8 @@ NMakefile: NMakefile.template .dep_segment Makefile.am maintMakefile
 #
 build.sh.in: build.template Makefile.am maintMakefile
        rm -f $@
-       sed -e 's@%objs%@$(filter-out remote-%, $(make_OBJECTS)@' \
-           -e 's@%globobjs%@$(patsubst %.c,%.o,$(globsrc)))@' \
+       sed -e 's@%objs%@$(filter-out remote-%, $(make_OBJECTS)@g' \
+           -e 's@%globobjs%@$(patsubst %.c,%.o,$(globsrc)))@g' \
          $< > $@
        chmod a-w+x $@