httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Jim Jagielski <...@hyperreal.com>
Subject cvs commit: apache/src Configure Makefile.tmpl
Date Sun, 13 Apr 1997 20:45:36 GMT
jim         97/04/13 13:45:35

  Modified:    src       Configure Makefile.tmpl
  Log:
  Closeout PR369: Make SHELL set by Configure and
  allow it to be changed as needed (eg: ULTRIX required /bin/sh5)
  
  Revision  Changes    Path
  1.89      +6 -1      apache/src/Configure
  
  Index: Configure
  ===================================================================
  RCS file: /export/home/cvs/apache/src/Configure,v
  retrieving revision 1.88
  retrieving revision 1.89
  diff -C3 -r1.88 -r1.89
  *** Configure	1997/04/07 09:44:17	1.88
  --- Configure	1997/04/13 20:45:33	1.89
  ***************
  *** 164,169 ****
  --- 164,172 ----
        RANLIB="true"
    fi
    
  + #
  + SHELL="/bin/sh"
  + 
    case "$PLAT" in
        *MPE/iX*)
            OS='MPE/iX'
  ***************
  *** 387,392 ****
  --- 390,396 ----
    	OS='ULTRIX'
    	CFLAGS="-DULTRIX"
    	DEF_WANTHSREGEX=yes
  + 	SHELL="/bin/sh5"
    	;;
        *powerpc-tenon-machten*)
    	OS='MachTen PPC'
  ***************
  *** 563,568 ****
  --- 567,573 ----
    echo "BROKEN_BPRINTF_FLAGS=$OSBPRINTF">> Makefile.config
    echo "REGLIB=$REGLIB">> Makefile.config
    echo "RANLIB=$RANLIB">> Makefile.config
  + echo "SHELL=$SHELL">> Makefile.config
    echo >> Makefile.config
    echo "#### End of Configure created section ####">> Makefile.config
    
  ***************
  *** 581,587 ****
    # hand-edit at your own risk!
    # 
    
  ! SHELL = /bin/sh
    EOF
    
    if [ "$RULE_WANTHSREGEX" = "yes" ]; then
  --- 586,592 ----
    # hand-edit at your own risk!
    # 
    
  ! SHELL=$SHELL
    EOF
    
    if [ "$RULE_WANTHSREGEX" = "yes" ]; then
  
  
  
  1.44      +0 -2      apache/src/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /export/home/cvs/apache/src/Makefile.tmpl,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -C3 -r1.43 -r1.44
  *** Makefile.tmpl	1997/03/24 22:49:09	1.43
  --- Makefile.tmpl	1997/04/13 20:45:34	1.44
  ***************
  *** 3,10 ****
    # This is combined with the information in the "Configuration" file
    # by the configure script to make the actual Makefile.
    
  - SHELL=/bin/sh
  - 
    CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
    LIBS=$(EXTRA_LIBS) $(LIBS1)
    INCLUDES=$(INCLUDES1) $(EXTRA_INCLUDES)
  --- 3,8 ----
  
  
  

Mime
View raw message