[Pkg-fedora-ds-maintainers] [libapache2-mod-nss] 13/156: Remove message about co-existing with mod_ssl, that works ok now. Also fix nasty typo.

[Timo Aaltonen]

This is an automated email from the git hooks/post-receive script.

tjaalton-guest pushed a commit to branch master
in repository libapache2-mod-nss.

commit 348a79cdcb335e0f65954045b4b583f1345efbf7
Author: rcritten <>
Date:   Fri Jun 3 14:43:30 2005 +0000

    Remove message about co-existing with mod_ssl, that works ok now.
    Also fix nasty typo.
---
 Makefile.am | 10 +---------
 Makefile.in | 10 +---------
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 8de5b22..7b4c60c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,17 +29,9 @@ install-libLTLIBRARIES: libmodnss.la
 	    fi \
 	else \
 	    if [ ! -f @apache_conf@/ssl.conf ]; then \
-		mv @apache_conf@/ssl.confnss.conf @apache_conf@/ssl.conf.old; \
+		mv @apache_conf@/ssl.conf @apache_conf@/ssl.conf.old; \
 	    fi \
 	fi
-	@echo ""
-	@echo "**********************   NOTE   **************************"
-	@echo "mod_nss and mod_ssl may not be installed at the same time."
-	@echo "An attempt has been made to rename ssl.conf to"
-	@echo "ssl.conf.old but be sure to double-check your Apache"
-	@echo "configuration."
-	@echo "**********************   NOTE   **************************"
-	@echo ""
 
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
diff --git a/Makefile.in b/Makefile.in
index 6f29fce..954cf9f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -477,17 +477,9 @@ install-libLTLIBRARIES: libmodnss.la
 	    fi \
 	else \
 	    if [ ! -f @apache_conf@/ssl.conf ]; then \
-		mv @apache_conf@/ssl.confnss.conf @apache_conf@/ssl.conf.old; \
+		mv @apache_conf@/ssl.conf @apache_conf@/ssl.conf.old; \
 	    fi \
 	fi
-	@echo ""
-	@echo "**********************   NOTE   **************************"
-	@echo "mod_nss and mod_ssl may not be installed at the same time."
-	@echo "An attempt has been made to rename ssl.conf to"
-	@echo "ssl.conf.old but be sure to double-check your Apache"
-	@echo "configuration."
-	@echo "**********************   NOTE   **************************"
-	@echo ""
 
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-fedora-ds/libapache2-mod-nss.git