httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@hyperreal.org
Subject cvs commit: apache-1.3/src/helpers mkdir.sh
Date Sat, 25 Apr 1998 19:27:05 GMT
rse         98/04/25 12:27:04

  Modified:    .        Makefile.tmpl configure
               src/helpers mkdir.sh
  Log:
  1. Make consistent usage of AUX dir even for active --shadow option
  2. Make sure we do NOT use the nice tar-based tree copy for includes
     because this does the wrong when --shadow is used: Symlinks!
  3. Make sure the correct umask is active when "cp" is used.
  
  Revision  Changes    Path
  1.26      +4 -7      apache-1.3/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/Makefile.tmpl,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- Makefile.tmpl	1998/04/22 14:56:28	1.25
  +++ Makefile.tmpl	1998/04/25 19:27:03	1.26
  @@ -80,6 +80,7 @@
   LN              = ln
   RM              = rm -f
   TAR             = tar
  +UMASK           = umask
   MKDIR           = $(AUX)/mkdir.sh
   INSTALL         = $(AUX)/install.sh -c
   INSTALL_PROGRAM = $(INSTALL) -s -m 755
  @@ -306,14 +307,10 @@
   #   install the Apache C header files
   install-include:
   	@echo "===> [include: Installing Apache C header files]"
  -	@echo "Copying tree $(SRC)/include/ -> $(includedir)/"; \
  -	(cd $(SRC)/include/ && $(TAR) cf - *) |\
  -	(cd $(includedir)/ && $(TAR) xf -); \
  -	find $(includedir)/ -type d -exec chmod a+rx {} \; ; \
  -	find $(includedir)/ -type f -exec chmod a+r {} \;
  +	$(UMASK) 022; $(CP) $(SRC)/include/*.h $(includedir)/;
   	@osdir=`grep '^OSDIR' $(SRC)/Makefile.config | sed -e 's:^OSDIR=::'`; \
  -	echo "$(CP) $(SRC)/$$osdir/os.h $(includedir)/"; \
  -	$(CP) $(SRC)/$$osdir/os.h $(includedir)/
  +	echo "$(UMASK) 022; $(CP) $(SRC)/$$osdir/os.h $(includedir)/"; \
  +	$(UMASK) 022; $(CP) $(SRC)/$$osdir/os.h $(includedir)/
   	@echo "<=== [include]"
   
   #   create an initial document root containing the Apache manual,
  
  
  
  1.17      +3 -1      apache-1.3/configure
  
  Index: configure
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/configure,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- configure	1998/04/22 14:00:21	1.16
  +++ configure	1998/04/25 19:27:03	1.17
  @@ -70,8 +70,8 @@
   ##
   
   root=.
  -src=src
   mkf=Makefile
  +src=src
   aux=src/helpers
   
   ##
  @@ -273,6 +273,7 @@
               #   set shadow paths
               shadowmkf="Makefile.$gnutriple"
               shadowsrc="src.$gnutriple"
  +            shadowaux="src.$gnutriple/helpers"
               #   (re)create shadow tree
               if [ .$quiet = .no ]; then
                   echo " + create shadow tree ($shadowsrc)"
  @@ -283,6 +284,7 @@
               #   delegate us to the shadow paths
               mkf=$shadowmkf
               src=$shadowsrc
  +            aux=$shadowaux
               ;;
           --help | -h | -help )
               echo "Usage: configure [options]"
  
  
  
  1.2       +1 -0      apache-1.3/src/helpers/mkdir.sh
  
  Index: mkdir.sh
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/helpers/mkdir.sh,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- mkdir.sh	1998/03/29 12:27:35	1.1
  +++ mkdir.sh	1998/04/25 19:27:04	1.2
  @@ -8,6 +8,7 @@
   ##  by Ralf S. Engelschall <rse@apache.org>
   ##
   
  +umask 022
   errstatus=0
   for file in ${1+"$@"} ; do 
       set fnord `echo ":$file" |\
  
  
  

Mime
View raw message