Changeset 2596 for vendor/gnumake/current/Makefile.DOS.template

Timestamp:

Jun 20, 2012, 12:44:52 AM (13 years ago)

Author:

bird

Message:

gnumake/current -> 3.82-cvs.

Location:

vendor/gnumake/current

Files:

• . (modified) (1 prop)
• Makefile.DOS.template (modified) (13 diffs)

vendor/gnumake/current/Makefile.DOS.template

@@ -3 +3 @@
 #
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-# 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+# 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 # This file is part of GNU Make.
 #
@@ -86 +86 @@
 man_MANS =      make.1
 
-INCLUDES =      -I$(srcdir)/glob -DLIBDIR=\"c:/djgpp/lib\" -DINCLUDEDIR=\"c:/djgpp/include\" -DLOCALEDIR=\"$(localedir)\"
+INCLUDES =      -I$(srcdir)/glob -DLIBDIR=\"$(prefix)$(libdir)\" -DINCLUDEDIR=\"$(prefix)$(includedir)\" -DLOCALEDIR=\"$(prefix)$(localedir)\"
 
 BUILT_SOURCES = README build.sh-in
@@ -92 +92 @@
 EXTRA_DIST =    $(BUILT_SOURCES) $(man_MANS) README.customs remote-cstms.c  make-stds.texi texinfo.tex SCOPTIONS SMakefile  Makefile.ami README.Amiga config.ami amiga.c amiga.h  NMakefile README.DOS configh.dos configure.bat makefile.com  README.W32 build_w32.bat config.h-W32 subproc.bat make.lnk  config.h-vms makefile.vms readme.vms vmsdir.h vmsfunctions.c  vmsify.c
 
-SUBDIRS =       glob
+SUBDIRS =       glob doc
 mkinstalldirs = ${exec_prefix}/bin/gmkdir -p
 CONFIG_HEADER = config.h
@@ -116 +116 @@
 TEXI2DVI = texi2dvi
 TEXINFO_TEX = $(srcdir)/config/texinfo.tex
-INFO_DEPS = make.info
-DVIS = make.dvi
+INFO_DEPS = doc/make.info
+DVIS = doc/make.dvi
 TEXINFOS = doc/make.texi
 noinst_TEXINFOS = doc/fdl.texi doc/make-stds.texi
 man1dir = $(mandir)/man1
 MANS = $(man_MANS)
-
-TEXI2HTML = texi2html
-TEXI2HTML_FLAGS = -split_chapter
 
 NROFF = nroff
@@ -192 +189 @@
 # Documentation
 
-make.info: doc/make.texi
-make.dvi: doc/make.texi
+make.info: make.texi
+make.dvi: make.texi
+make.ps: make.dvi make.texi
+make.html: make.texi
 
 
@@ -201 +200 @@
         @command.com /c if exist make.info* del make.info*
         @command.com /c if exist make.i* del make.i*
-        $(MAKEINFO) -I$(srcdir)/doc --no-split $< -o ./$@
+        $(MAKEINFO) -I$(srcdir) --no-split $< -o ./$@
 
 .texi:
         @command.com /c if exist make.info* del make.info*
         @command.com /c if exist make.i* del make.i*
-        $(MAKEINFO) -I$(srcdir)/doc --no-split $< -o ./$@
+        $(MAKEINFO) -I$(srcdir) --no-split $< -o ./$@
 
 .texi.dvi:
-        TEXINPUTS="$(srcdir)/doc;$$TEXINPUTS"    MAKEINFO='$(MAKEINFO) -I $(srcdir)/doc' $(TEXI2DVI) $<
+        TEXINPUTS="$(srcdir);$$TEXINPUTS"    MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
 
 .dvi.ps:
@@ -216 +215 @@
 # Other documentation formats
 
-html: make_1.html
-
-make_1.html: $(TEXINFOS) $(noinst_TEXINFOS)
-        $(TEXI2HTML) $(TEXI2HTML_FLAGS) $(srcdir)/doc/make.texi
+html: html-recursive
+
+.texi.html:
+        @command.com /c if exist make.html* del make.html*
+        $(MAKEINFO) --html -I$(srcdir) --no-split $< -o ./$@
 
 install-info-am: $(INFO_DEPS)
         @$(NORMAL_INSTALL)
         $(mkinstalldirs) $(DESTDIR)$(infodir)
-        @for file in $(INFO_DEPS); do    d=$(srcdir);    for ifile in `cd $$d && echo $$file`; do      if test -f $$d/$$ifile; then        echo " $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile"; $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile; else : ; fi;    done;  done
+        @for file in $(INFO_DEPS); do    iifile=`echo $$file | sed "s|doc/||"`;    d=$(srcdir);    for ifile in `cd $$d && echo $$file`; do      if test -f $$d/$$ifile; then        echo " $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$iifile"; $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$iifile; else : ; fi;    done;  done
         @$(POST_INSTALL)
-        @if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then    for file in $(INFO_DEPS); do      echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file";     install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file || :;   done;  else : ; fi
+        @if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then    for file in $(INFO_DEPS); do    iifile=`echo $$file | sed "s|doc/||"`;      echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$iifile";     install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$iifile || :;   done;  else : ; fi
 
 uninstall-info:
@@ -238 +238 @@
 
 mostlyclean-aminfo:
-        -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
+        -rm -f $(srcdir)/doc/make.aux $(srcdir)/doc/make.cp $(srcdir)/doc/make.cps $(srcdir)/doc/make.dvi \
+          $(srcdir)/doc/make.fn $(srcdir)/doc/make.fns $(srcdir)/doc/make.ky $(srcdir)/doc/make.kys \
+          $(srcdir)/doc/make.ps $(srcdir)/doc/make.log $(srcdir)/doc/make.pg $(srcdir)/doc/make.toc \
+          $(srcdir)/doc/make.tp $(srcdir)/doc/make.tps $(srcdir)/doc/make.vr $(srcdir)/doc/make.vrs \
+          $(srcdir)/doc/make.op $(srcdir)/doc/make.tr $(srcdir)/doc/make.cv $(srcdir)/doc/make.cn \
+          $(srcdir)/doc/make.html
 
 clean-aminfo:
@@ -292 +295 @@
 # a single directory, yell bloody murder.
 all-recursive:
-ifeq ($(words $(SUBDIRS)), 1)
+ifeq ($(findstring glob, $(SUBDIRS)), glob)
         @command.com /c if not exist glob\\nul md glob
-        @echo Making all in $(SUBDIRS)
-        $(MAKE) -C $(SUBDIRS) -f ../Makefile INCLUDES='-I$(srcdir) -I$(srcdir)/glob' DEFS='-I.. -I$(srcdir)' VPATH=$(srcdir)/glob libglob.a
-else
-        @echo FATAL: There is more than one directory in "($(SUBDIRS))"
-        @$(EXIT_FAIL)
+        @echo Making all in glob
+        $(MAKE) -C glob -f ../Makefile INCLUDES='-I$(srcdir) -I$(srcdir)/glob' DEFS='-I.. -I$(srcdir)' VPATH=$(srcdir)/glob libglob.a
 endif
 
@@ -311 +311 @@
 mostlyclean-recursive clean-recursive distclean-recursive \
 maintainer-clean-recursive check-recursive:
-ifeq ($(words $(SUBDIRS)), 1)
-        @echo Making $(shell echo $@ | sed s/-recursive//) in $(SUBDIRS)
-        $(MAKE) -C $(SUBDIRS) -f ../Makefile $(shell echo $@ | sed s/-recursive//)-am
+ifeq ($(words $(SUBDIRS)), 2)
+        @echo Making $(shell echo $@ | sed s/-recursive//) in glob
+        $(MAKE) -C glob -f ../Makefile $(shell echo $@ | sed s/-recursive//)-am
+        @echo Making $(shell echo $@ | sed s/-recursive//) in doc
+        $(MAKE) -C doc -f ../Makefile $(shell echo $@ | sed s/-recursive//)-am
 else
-        @echo FATAL: There is more than one directory in "($(SUBDIRS))"
+        @echo FATAL: There is more than two directory in "($(SUBDIRS))"
         @$(EXIT_FAIL)
 endif
@@ -323 +325 @@
 
 tags-recursive:
-ifeq ($(words $(SUBDIRS)), 1)
+ifeq ($(words $(SUBDIRS)), 2)
         $(MAKE) tags-in-glob
 else
-        @echo FATAL: There is more than one directory in "($(SUBDIRS))"
+        @echo FATAL: There is more than two directory in "($(SUBDIRS))"
         @$(EXIT_FAIL)
 endif
@@ -377 +379 @@
         $(MAKE) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook
 
-info: $(INFO_DEPS) info-recursive
-dvi: $(DVIS) dvi-recursive
+info: info-recursive
+info-recursive:
+ifeq ($(findstring doc, $(SUBDIRS)), doc)
+        @command.com /c if not exist doc\\nul md doc
+        @echo Making all in doc
+        $(MAKE) -C doc -f ../Makefile VPATH=$(srcdir)/doc make.info
+endif
+
+dvi: dvi-recursive
+dvi-recursive:
+ifeq ($(findstring doc, $(SUBDIRS)), doc)
+        @command.com /c if not exist doc\\nul md doc
+        @echo Making all in doc
+        $(MAKE) -C doc -f ../Makefile VPATH=$(srcdir)/doc make.dvi
+endif
+
+ps: ps-recursive
+ps-recursive:
+ifeq ($(findstring doc, $(SUBDIRS)), doc)
+        @command.com /c if not exist doc\\nul md doc
+        @echo Making all in doc
+        $(MAKE) -C doc -f ../Makefile VPATH=$(srcdir)/doc make.ps
+endif
+
+html-recursive:
+ifeq ($(findstring doc, $(SUBDIRS)), doc)
+        @command.com /c if not exist doc\\nul md doc
+        @echo Making all in doc
+        $(MAKE) -C doc -f ../Makefile VPATH=$(srcdir)/doc make.html
+endif
+
 check: all-am check-recursive check-local
         @:
@@ -385 +416 @@
         $(MAKE) all-recursive
 
-all-am: Makefile $(INFO_DEPS) $(PROGRAMS) config.h
+all-am: Makefile $(PROGRAMS) config.h info
 
 install-exec-am: install-binPROGRAMS