httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From grega...@apache.org
Subject cvs commit: httpd-2.0 Makefile.in
Date Fri, 19 Jul 2002 15:11:58 GMT
gregames    2002/07/19 08:11:58

  Modified:    .        Makefile.in
  Log:
  Install mime.types and magic in conf/ if they don't already exist.
  
  This also re-enables existing logic to always install *-std.conf with
  substitutions made.  These are then copied into *.conf (without the -std) if
  that file doesn't already exist.
  
  style police: please chill for a bit.  I intentionally didn't re-format
  the indenting in this commit to make it easier to review.
  
  Revision  Changes    Path
  1.122     +5 -5      httpd-2.0/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/Makefile.in,v
  retrieving revision 1.121
  retrieving revision 1.122
  diff -u -r1.121 -r1.122
  --- Makefile.in	1 Jul 2002 11:44:21 -0000	1.121
  +++ Makefile.in	19 Jul 2002 15:11:58 -0000	1.122
  @@ -27,14 +27,15 @@
   include $(top_srcdir)/build/program.mk
   
   install-conf:
  -	-@if [ -d $(DESTDIR)$(sysconfdir) ]; then \
  -           echo "[PRESERVING EXISTING CONF SUBDIR: $(DESTDIR)$(sysconfdir)]"; \
  -        else \
  -	    echo Installing configuration files ; \
  +	@echo Installing configuration files ; \
  +	if [ -d $(DESTDIR)$(sysconfdir) ]; then \
   	    $(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir) ; \
  +	fi ; \
   	    cd $(top_srcdir)/docs/conf; \
   	    for i in mime.types magic; do \
  +	        if test ! -f $(DESTDIR)$(sysconfdir)/$$i; then \
   	    	$(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir); \
  +	        fi; \
   	    done; \
   	    for j in $(top_srcdir)/docs/conf $(top_builddir)/docs/conf ; do \
   	    	cd $$j ; \
  @@ -86,7 +87,6 @@
   	        if test ! -f $(DESTDIR)$(sbindir)/envvars; then \
   	            cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \
   	        fi ; \
  -	    fi ; \
   	fi
   
   install-build:
  
  
  

Mime
View raw message