httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject cvs commit: httpd-2.0/support Makefile.in
Date Fri, 13 Apr 2001 00:46:22 GMT
rbb         01/04/12 17:46:22

  Modified:    .        CHANGES Makefile.in
               support  Makefile.in
  Log:
  Do not install the binaries from the support directory twice.
  PR:	7490
  Submitted by:	jun-ichiro hagino <itojun@iijlab.net>
  
  Revision  Changes    Path
  1.173     +3 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.172
  retrieving revision 1.173
  diff -u -d -b -w -u -r1.172 -r1.173
  --- CHANGES	2001/04/12 20:06:48	1.172
  +++ CHANGES	2001/04/13 00:46:21	1.173
  @@ -1,5 +1,8 @@
   Changes with Apache 2.0.17-dev
   
  +  *) Do not install the binaries from the support directory twice.
  +     [jun-ichiro hagino <itojun@iijlab.net>]
  +
     *) The ap_f* functions should flush data to the filter that is passed
        in, not the the filter after the one passed in.
        [Ryan Morgan <rmorgan@covalent.net>]
  
  
  
  1.67      +1 -18     httpd-2.0/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/Makefile.in,v
  retrieving revision 1.66
  retrieving revision 1.67
  diff -u -d -b -w -u -r1.66 -r1.67
  --- Makefile.in	2001/04/11 06:44:03	1.66
  +++ Makefile.in	2001/04/13 00:46:21	1.67
  @@ -16,7 +16,7 @@
   targets         = $(PROGRAMS) $(other_targets)
   phony_targets   = $(srcdir)/buildmark.c
   install_targets = install-conf install-htdocs install-icons install-other \
  -	install-cgi install-include install-support install-suexec
  +	install-cgi install-include install-suexec
   DISTCLEAN_TARGETS  = include/ap_config_auto.h include/ap_config_path.h \
   	modules.c libtool
   EXTRACLEAN_TARGETS = configure include/ap_config_auto.h.in \
  @@ -74,23 +74,6 @@
   	@test -d $(cgidir) || $(MKINSTALLDIRS) $(cgidir)
   	@(cd docs/cgi-examples && cp -rp * $(cgidir))
   	@(cd $(cgidir) && find . -name "CVS" -print | xargs rm -rf {} \;)
  -
  -install-support:
  -	@echo Installing Support Binaries
  -	@test -d $(bindir) || $(MKINSTALLDIRS) $(bindir)
  -	@cp -p $(srcdir)/support/httpd.exp $(bindir)
  -	@cp -p $(builddir)/support/htpasswd $(bindir)
  -	@cp -p $(builddir)/support/htdigest $(bindir)
  -	@cp -p $(builddir)/support/rotatelogs $(bindir)
  -	@cp -p $(builddir)/support/logresolve $(bindir)
  -	@cp -p $(builddir)/support/ab $(bindir)
  -	@cp -p $(builddir)/support/apachectl $(bindir)
  -	chmod 755 $(bindir)/apachectl
  -	@if test -f $(builddir)/support/apxs; then \
  -	    cp -p $(builddir)/support/apxs $(bindir); \
  -	    chmod 755 $(bindir)/apxs; \
  -	fi
  -
   
   install-other:
   	@test -d $(logfiledir) || $(MKINSTALLDIRS) $(logfiledir)
  
  
  
  1.14      +10 -0     httpd-2.0/support/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/Makefile.in,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -d -b -w -u -r1.13 -r1.14
  --- Makefile.in	2001/04/11 06:44:07	1.13
  +++ Makefile.in	2001/04/13 00:46:22	1.14
  @@ -10,6 +10,16 @@
   
   include $(top_srcdir)/build/rules.mk
   
  +install:
  +	@test -d $(bindir) || $(MKINSTALLDIRS) $(bindir)
  +	@cp -p httpd.exp $(bindir)
  +	@cp -p apachectl $(bindir)
  +	chmod 755 $(bindir)/apachectl
  +	@if test -f $(builddir)/apxs; then \
  +	    cp -p apxs $(bindir); \
  +	    chmod 755 $(bindir)/apxs; \
  +	fi
  +
   htpasswd_OBJECTS = htpasswd.lo
   htpasswd: $(htpasswd_OBJECTS)
   	$(LINK) $(htpasswd_OBJECTS) $(PROGRAM_LDADD)
  
  
  

Mime
View raw message