httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From field...@hyperreal.org
Subject cvs commit: apache-1.3/src CHANGES
Date Mon, 08 Mar 1999 20:50:11 GMT
fielding    99/03/08 12:50:09

  Modified:    .        Makefile.tmpl STATUS
               src      CHANGES
  Log:
  Add cgidir, htdocsdir, iconsdir variables to Makefile.tmpl in order
  to make platform installations easier.
  
  Submitted by:	Wilfredo Sanchez <wsanchez@apple.com>
  Reviewed by:	Roy Fielding
  
  Revision  Changes    Path
  1.66      +23 -20    apache-1.3/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /home/cvs/apache-1.3/Makefile.tmpl,v
  retrieving revision 1.65
  retrieving revision 1.66
  diff -u -r1.65 -r1.66
  --- Makefile.tmpl	1999/02/10 12:27:22	1.65
  +++ Makefile.tmpl	1999/03/08 20:50:04	1.66
  @@ -112,6 +112,9 @@
   mandir          = @mandir@
   sysconfdir      = @sysconfdir@
   datadir         = @datadir@
  +iconsdir        = $(datadir)/icons
  +htdocsdir       = $(datadir)/htdocs
  +cgidir          = $(datadir)/cgi-bin
   includedir      = @includedir@
   localstatedir   = @localstatedir@
   runtimedir      = @runtimedir@
  @@ -246,9 +249,9 @@
   	$(MKDIR) $(root)$(mandir)/man1
   	$(MKDIR) $(root)$(mandir)/man8
   	$(MKDIR) $(root)$(sysconfdir)
  -	$(MKDIR) $(root)$(datadir)/htdocs
  -	$(MKDIR) $(root)$(datadir)/icons
  -	$(MKDIR) $(root)$(datadir)/cgi-bin
  +	$(MKDIR) $(root)$(htdocsdir)
  +	$(MKDIR) $(root)$(iconsdir)
  +	$(MKDIR) $(root)$(cgidir)
   	$(MKDIR) $(root)$(includedir)
   	$(MKDIR) $(root)$(runtimedir)
   	$(MKDIR) $(root)$(logfiledir)
  @@ -376,31 +379,31 @@
   #   icons and distributed CGI scripts.
   install-data:
   	@echo "===> [data: Installing initial data files]"
  -	-@if [ -f $(root)$(datadir)/htdocs/index.html ]; then \
  -		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/htdocs/]"; \
  +	-@if [ -f $(root)$(htdocsdir)/index.html ]; then \
  +		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \
   	else \
  -		echo "Copying tree $(TOP)/htdocs/ -> $(root)$(datadir)/htdocs/"; \
  +		echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir)/"; \
   		(cd $(TOP)/htdocs/ && $(TAR) $(TAROPT) - *) |\
  -		(cd $(root)$(datadir)/htdocs/ && $(TAR) -xf -); \
  -		find $(root)$(datadir)/htdocs/ -type d -exec chmod a+rx {} \; ; \
  -		find $(root)$(datadir)/htdocs/ -type f -exec chmod a+r {} \; ; \
  +		(cd $(root)$(htdocsdir)/ && $(TAR) -xf -); \
  +		find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \
  +		find $(root)$(htdocsdir)/ -type f -exec chmod a+r {} \; ; \
   	fi
  -	-@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \
  -		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \
  +	-@if [ -f $(root)$(cgidir)/printenv ]; then \
  +		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \
   	else \
   		for script in printenv test-cgi; do \
   			cat $(TOP)/cgi-bin/$${script} |\
   			sed -e 's;^#!/.*perl;#!$(PERL);' \
   			> $(TOP)/$(SRC)/.apaci.install.tmp; \
  -			echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(datadir)/cgi-bin/$${script}";
\
  -			$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(datadir)/cgi-bin/$${script};
\
  +			echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir)/$${script}"; \
  +			$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir)/$${script}; \
   		done; \
   	fi
  -	@echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \
  +	@echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \
   	(cd $(TOP)/icons/ && $(TAR) $(TAROPT) - *) |\
  -	(cd $(root)$(datadir)/icons/ && $(TAR) -xf -); \
  -	find $(root)$(datadir)/icons/ -type d -exec chmod a+rx {} \; ;\
  -	find $(root)$(datadir)/icons/ -type f -exec chmod a+r {} \;
  +	(cd $(root)$(iconsdir)/ && $(TAR) -xf -); \
  +	find $(root)$(iconsdir)/ -type d -exec chmod a+rx {} \; ;\
  +	find $(root)$(iconsdir)/ -type f -exec chmod a+r {} \;
   	@echo "<=== [data]"
   
   #   create the initial configuration by providing default files
  @@ -424,9 +427,9 @@
   		 echo ""; \
   		 cat $(TOP)/conf/$${conf}-dist ) |\
   		 sed -e '/# LoadModule/r $(TOP)/$(SRC)/.apaci.install.conf' \
  -			-e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \
  -			-e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \
  -			-e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \
  +			-e 's;@@ServerRoot@@/htdocs;$(htdocsdir);' \
  +			-e 's;@@ServerRoot@@/icons;$(iconsdir);' \
  +			-e 's;@@ServerRoot@@/cgi-bin;$(cgidir);' \
   			-e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \
   			-e 's;@@ServerRoot@@;$(prefix);g' \
   			-e 's;logs/accept.lock;$(runtimedir)/$(TARGET).lock;' \
  
  
  
  1.642     +1 -5      apache-1.3/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/apache-1.3/STATUS,v
  retrieving revision 1.641
  retrieving revision 1.642
  diff -u -r1.641 -r1.642
  --- STATUS	1999/03/08 20:03:16	1.641
  +++ STATUS	1999/03/08 20:50:04	1.642
  @@ -1,5 +1,5 @@
     1.3 STATUS:
  -  Last modified at [$Date: 1999/03/08 20:03:16 $]
  +  Last modified at [$Date: 1999/03/08 20:50:04 $]
   
   Release:
   
  @@ -61,10 +61,6 @@
         ftp://ftp.kame.net/pub/kame/misc/apache-134-v6-19990118.diff.gz
           Message-ID: <18586.916662926@coconut.itojun.org>
           Status: Lars +1 (on concept)
  -
  -    * Fred's PATCH: Add cgidir, htdocsdir, iconsdir variables in Makefile.tmpl
  -        Message-ID: <199901140037.QAA18934@scv1.apple.com>
  -        Status: Ralf +1 (on concept)
   
       * Fred's PATCH: Add Mac OS X Server Layout file layout
           Message-ID: <199901140039.QAA31642@scv2.apple.com>
  
  
  
  1.1267    +3 -0      apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1266
  retrieving revision 1.1267
  diff -u -r1.1266 -r1.1267
  --- CHANGES	1999/03/08 20:03:19	1.1266
  +++ CHANGES	1999/03/08 20:50:06	1.1267
  @@ -1,5 +1,8 @@
   Changes with Apache 1.3.5
   
  +  *) Add cgidir, htdocsdir, iconsdir variables to Makefile.tmpl in order
  +     to make platform installations easier.  [Wilfredo Sanchez]
  +
     *) In configure, do not append the target name to the directory path if
        the path already contains "apache".  [Ralf S. Engelschall]
   
  
  
  

Mime
View raw message