DO NOT REPLY [Bug 9685] New: - Don't install defaylt htdocs over an existing setup

[bu...@apache.org]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
<http://nagoya.apache.org/bugzilla/show_bug.cgi?id=9685>.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND 
INSERTED IN THE BUG DATABASE.

http://nagoya.apache.org/bugzilla/show_bug.cgi?id=9685

Don't install defaylt htdocs over an existing setup

           Summary: Don't install defaylt htdocs over an existing setup
           Product: Apache httpd-2.0
           Version: 2.0.36
          Platform: Other
        OS/Version: Other
            Status: NEW
          Severity: Enhancement
          Priority: Other
         Component: Build
        AssignedTo: bugs@httpd.apache.org
        ReportedBy: bruno@wolff.to


I found it inconvenient to keep removing the apache_* and index.html.*
files that kept getting copied into my existing htdocs directory
everytime I rebuild 2.0.37.
I have a patch for Makefile.in which doesn't try to install the
default web page unless the htdocs directory doesn't exist. I also
change things not to remove the CVS subdirectory unless it has just
done a copy, so as not remove a CVS directory that is supposed to be
there.
*** Makefile.in Fri Jun  7 01:15:18 2002
--- Makefile.in.orig    Fri Jun  7 01:07:51 2002
***************
*** 104,116 ****

  install-htdocs:
        @echo Installing HTML documents
!       @test -d $(htdocsdir) || ($(MKINSTALLDIRS) $(htdocsdir) && \
!               test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && \
!               cp -rp * $(htdocsdir)) && \
!               test "x$(htdocsdir)" != "x" && cd $(htdocsdir) && \
!               find . -name "CVS" -print | xargs rm -rf)
        @test -d $(manualdir) || $(MKINSTALLDIRS) $(manualdir)
        @test -d $(top_srcdir)/docs/manual && (cd $(top_srcdir)/docs/manual && cp -rp * $(manualdir))

  install-error:
        @echo Installing error documents
--- 104,114 ----

  install-htdocs:
        @echo Installing HTML documents
!       @test -d $(htdocsdir) || $(MKINSTALLDIRS) $(htdocsdir)
!       @test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(htdocsdir))
        @test -d $(manualdir) || $(MKINSTALLDIRS) $(manualdir)
        @test -d $(top_srcdir)/docs/manual && (cd $(top_srcdir)/docs/manual && cp -rp * $(manualdir))
+       @test "x$(htdocsdir)" != "x" && cd $(htdocsdir) && find . -name "CVS" -print | xargs rm -rf

  install-error:
        @echo Installing error documents

---------------------------------------------------------------------
To unsubscribe, e-mail: bugs-unsubscribe@httpd.apache.org
For additional commands, e-mail: bugs-help@httpd.apache.org