automake-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[patch] POSIXLY_CORRECT


From: Nathan Sidwell
Subject: [patch] POSIXLY_CORRECT
Date: Wed, 09 Oct 2002 09:38:08 +0100
User-agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.0.1) Gecko/20020823 Netscape/7.0

Hi,
The attached patch makes option ordering POSIXLY_CORRECT. Without it
things like autoconf die horribly :)

nathan
--
Dr Nathan Sidwell   ::   http://www.codesourcery.com   ::   CodeSourcery LLC
         'But that's a lie.' - 'Yes it is. What's your point?'
address@hidden : http://www.cs.bris.ac.uk/~nathan/ : address@hidden

2002-10-09  Nathan Sidwell  <address@hidden>

        * lib/am/texibuiild.am, lib/am/texinfos.am: POSIXLY_CORRECT option
        ordering.

Index: lib/am/texibuild.am
===================================================================
RCS file: /cvsroot/automake/automake/lib/am/texibuild.am,v
retrieving revision 1.10
diff -c -3 -p -r1.10 texibuild.am
*** lib/am/texibuild.am 24 Sep 2002 22:30:38 -0000      1.10
--- lib/am/texibuild.am 9 Oct 2002 08:32:01 -0000
***************
*** 31,37 ****
  ## Therefore we ensure that %DIRSTAMP% exists in the rule.
  ?DIRSTAMP?    @test -f %DIRSTAMP% || $(MAKE) %DIRSTAMP%
        $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) %MAKEINFOFLAGS% \
!       `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE% -o $@
  
  ?GENERIC?%SOURCE_SUFFIX%.dvi:
  ?!GENERIC?%DEST_PREFIX%.dvi: %SOURCE% %DEPS% %DIRSTAMP%
--- 31,37 ----
  ## Therefore we ensure that %DIRSTAMP% exists in the rule.
  ?DIRSTAMP?    @test -f %DIRSTAMP% || $(MAKE) %DIRSTAMP%
        $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) %MAKEINFOFLAGS% \
!       -o $@ `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%
  
  ?GENERIC?%SOURCE_SUFFIX%.dvi:
  ?!GENERIC?%DEST_PREFIX%.dvi: %SOURCE% %DEPS% %DIRSTAMP%
***************
*** 41,47 ****
        MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) 
%MAKEINFOFLAGS%' \
  ## Do not use `-o' unless necessary: it is only supported since Texinfo 4.1.
  ?GENERIC?     $(TEXI2DVI) `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%
! ?!GENERIC?    $(TEXI2DVI) `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE% 
-o $@
  
  ?GENERIC?%SOURCE_SUFFIX%.pdf:
  ?!GENERIC?%DEST_PREFIX%.pdf: %SOURCE% %DEPS% %DIRSTAMP%
--- 41,47 ----
        MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) 
%MAKEINFOFLAGS%' \
  ## Do not use `-o' unless necessary: it is only supported since Texinfo 4.1.
  ?GENERIC?     $(TEXI2DVI) `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%
! ?!GENERIC?    $(TEXI2DVI) -o $@ `test -f '%SOURCE%' || echo 
'$(srcdir)/'`%SOURCE%
  
  ?GENERIC?%SOURCE_SUFFIX%.pdf:
  ?!GENERIC?%DEST_PREFIX%.pdf: %SOURCE% %DEPS% %DIRSTAMP%
***************
*** 51,57 ****
        MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) 
%MAKEINFOFLAGS%' \
  ## Do not use `-o' unless necessary: it is only supported since Texinfo 4.1.
  ?GENERIC?     $(TEXI2PDF) `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%
! ?!GENERIC?    $(TEXI2PDF) `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE% 
-o $@
  
  ## If we are using the generic rules, we need separate dependencies.
  ## (Don't wonder about %DIRSTAMP% here, this is used only by non-generic
--- 51,57 ----
        MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) 
%MAKEINFOFLAGS%' \
  ## Do not use `-o' unless necessary: it is only supported since Texinfo 4.1.
  ?GENERIC?     $(TEXI2PDF) `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%
! ?!GENERIC?    $(TEXI2PDF) -o $@ `test -f '%SOURCE%' || echo 
'$(srcdir)/'`%SOURCE%
  
  ## If we are using the generic rules, we need separate dependencies.
  ## (Don't wonder about %DIRSTAMP% here, this is used only by non-generic
Index: lib/am/texinfos.am
===================================================================
RCS file: /cvsroot/automake/automake/lib/am/texinfos.am,v
retrieving revision 1.98
diff -c -3 -p -r1.98 texinfos.am
*** lib/am/texinfos.am  11 Sep 2002 08:00:10 -0000      1.98
--- lib/am/texinfos.am  9 Oct 2002 08:32:01 -0000
*************** endif %?LOCAL-TEXIS%
*** 56,62 ****
  if %?LOCAL-TEXIS%
  DVIPS = dvips
  .dvi.ps:
!       $(DVIPS) $< -o $@
  endif %?LOCAL-TEXIS%
  
  .PHONY: info info-am dvi dvi-am pdf pdf-am
--- 56,62 ----
  if %?LOCAL-TEXIS%
  DVIPS = dvips
  .dvi.ps:
!       $(DVIPS) -o $@ $<
  endif %?LOCAL-TEXIS%
  
  .PHONY: info info-am dvi dvi-am pdf pdf-am

reply via email to

[Prev in Thread] Current Thread [Next in Thread]