Ignore:
Timestamp:
Jun 17, 2012, 10:45:31 PM (13 years ago)
Author:
bird
Message:

kmk: Merged in changes from GNU make 3.82. Previous GNU make base version was gnumake-2008-10-28-CVS.

Location:
trunk/src/kmk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/kmk

    • Property svn:ignore

      •  

        old new  
        1313stamp-*
        1414makebook*
         15
        1516.*gdbinit
         17.gdb_history
         18
        1619*.dep
        1720*.dvi
        … …  
        3134*.pg
        3235*.pgs
         36
        3337README
        3438README.DOS
        3539README.W32
         40README.OS2
        3641aclocal.m4
        3742autom4te.cache
        … …  
        5257config.h.W32
        5358config.h-vms
         59
        5460loadavg
        5561loadavg.c
        5662make
         63
        5764.deps
        5865.dep_segment
         66ID
         67TAGS
         68
        5969_*
        6070sun4
        … …  
        7282sol2
        7383i486-linux
         84
        7485customs
         86
        7587install-sh
        7688mkinstalldirs
         89
         90.directive.asc

  • trunk/src/kmk/configure.bat

    r1993 r2591  
    1 <<<<<<< .working
    21@echo off
    32rem Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
    4 rem 2004, 2005, 2006 Free Software Foundation, Inc.
    5 rem This file is part of GNU Make.
    6 
    7 rem GNU Make is free software; you can redistribute it and/or modify it under
    8 rem the terms of the GNU General Public License as published by the Free
    9 rem Software Foundation; either version 2, or (at your option) any later
    10 rem version.
    11 
    12 rem GNU Make is distributed in the hope that it will be useful, but WITHOUT
    13 rem ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    14 rem FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
    15 rem more details.
    16 
    17 rem You should have received a copy of the GNU General Public License along
    18 rem with GNU Make; see the file COPYING.  If not, write to the Free Software
    19 rem Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    20 
    21 echo Configuring MAKE for DJGPP
    22 
    23 rem The SmallEnv trick protects against too small environment block,
    24 rem in which case the values will be truncated and the whole thing
    25 rem goes awry.  COMMAND.COM will say "Out of environment space", but
    26 rem many people don't care, so we force them to care by refusing to go.
    27 
    28 rem Where is the srcdir?
    29 set XSRC=.
    30 if not "%XSRC%"=="." goto SmallEnv
    31 if "%1%"=="" goto SrcDone
    32 set XSRC=%1
    33 if not "%XSRC%"=="%1" goto SmallEnv
    34 
    35 :SrcDone
    36 
    37 update %XSRC%/configh.dos ./config.h
    38 
    39 rem Do they have Make?
    40 redir -o junk.$$$ -eo make -n -f NUL
    41 rem REDIR will return 1 if it cannot run Make.
    42 rem If it can run Make, it will usually return 2,
    43 rem but 0 is also OK with us.
    44 if errorlevel 2 goto MakeOk
    45 if not errorlevel 1 goto MakeOk
    46 if exist junk.$$$ del junk.$$$
    47 echo No Make program found--use DOSBUILD.BAT to build Make.
    48 goto End
    49 
    50 rem They do have Make.  Generate the Makefile.
    51 
    52 :MakeOk
    53 del junk.$$$
    54 update %XSRC%/Makefile.DOS ./Makefile
    55 echo Done.
    56 if not "%XSRC%"=="." echo Invoke Make thus: "make srcdir=%XSRC%"
    57 goto End
    58 
    59 :SmallEnv
    60 echo Your environment is too small.  Please enlarge it and run me again.
    61 
    62 :End
    63 set XRSC=
    64 =======
    65 @echo off
    66 rem Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
    67 rem 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
     3rem 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
    684rem This file is part of GNU Make.
    695rem
    … …  
    12460:End
    12561set XRSC=
    126 >>>>>>> .merge-right.r1992
Note: See TracChangeset for help on using the changeset viewer.