diff options
| author | Greg Ames <gregames@apache.org> | 2002-07-19 17:11:58 +0200 |
|---|---|---|
| committer | Greg Ames <gregames@apache.org> | 2002-07-19 17:11:58 +0200 |
| commit | 3151bec9d9234811c07d070b2e7406b0520ebe9f (patch) | |
| tree | 8550ba1347ee1327e7ea38ab0ca2ac9a6b633dab /Makefile.in | |
| parent | spell check (diff) | |
| download | apache2-3151bec9d9234811c07d070b2e7406b0520ebe9f.tar.xz apache2-3151bec9d9234811c07d070b2e7406b0520ebe9f.zip | |
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.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96127 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in index 19cc733df0..b9d183e93a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -27,14 +27,15 @@ include $(top_builddir)/build/rules.mk 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 @@ install-conf: if test ! -f $(DESTDIR)$(sbindir)/envvars; then \ cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \ fi ; \ - fi ; \ fi install-build: |