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 CHANGES
Date Wed, 22 Apr 1998 10:33:06 GMT
rse         98/04/22 03:33:06

  Modified:    .        STATUS Makefile.tmpl
               src      CHANGES
  Log:
  Be friendly to existing "mime.types" and "magic" files on "make install", too.
  
  Revision  Changes    Path
  1.325     +1 -0      apache-1.3/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/STATUS,v
  retrieving revision 1.324
  retrieving revision 1.325
  diff -u -r1.324 -r1.325
  --- STATUS	1998/04/22 08:45:48	1.324
  +++ STATUS	1998/04/22 10:33:03	1.325
  @@ -62,6 +62,7 @@
       * Ralf's configure fix to avoid side-effects in Configure on exported vars
       * Ralf's fix for the install-config target to get correct ScoreBoardFile
       * Dynamic Shared Object (DSO) support for OpenBSD 2.x
  +    * Ralf's enhanced "make install" carefulness for mime.types+magic files
   
   Available Patches:
   
  
  
  
  1.24      +10 -2     apache-1.3/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/Makefile.tmpl,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- Makefile.tmpl	1998/04/21 17:33:58	1.23
  +++ Makefile.tmpl	1998/04/22 10:33:04	1.24
  @@ -368,8 +368,16 @@
   			echo "[PRESERVING EXISTING CONFIG FILE: $(sysconfdir)/$$conf]"; \
   		fi; \
   	done
  -	$(CP) $(ROOT)/conf/mime.types $(sysconfdir)/mime.types
  -	$(CP) $(ROOT)/conf/magic $(sysconfdir)/magic
  +	-@for conf in mime.types magic; do \
  +		echo "$(INSTALL_DATA) $(ROOT)/conf/$$conf $(sysconfdir)/$$conf.default"; \
  +		$(INSTALL_DATA) $(ROOT)/conf/$$conf $(sysconfdir)/$$conf.default; \
  +		if [ ! -f "$(sysconfdir)/$$conf" ]; then \
  +			echo "$(INSTALL_DATA) $(ROOT)/conf/$$conf $(sysconfdir)/$$conf"; \
  +			$(INSTALL_DATA) $(ROOT)/conf/$$conf $(sysconfdir)/$$conf; \
  +		else \
  +			echo "[PRESERVING EXISTING CONFIG FILE: $(sysconfdir)/$$conf]"; \
  +		fi; \
  +	done
   	@echo "<=== [config]"
   
   
  
  
  
  1.790     +5 -0      apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.789
  retrieving revision 1.790
  diff -u -r1.789 -r1.790
  --- CHANGES	1998/04/22 08:45:52	1.789
  +++ CHANGES	1998/04/22 10:33:05	1.790
  @@ -1,5 +1,10 @@
   Changes with Apache 1.3b7
   
  +  *) Make sure that "make install" doesn't overwrite the `mime.types' and
  +     `magic' files from an existing Apache installation. Because people often
  +     customize these for own MIME and content types.
  +     [Ralf S. Engelschall]
  +
     *) PORT: Dynamic Shared Object (DSO) support for OpenBSD 2.x
        [Peter Galbavy, Ralf S. Engelschall] PR#2109
   
  
  
  

Mime
View raw message