From: Chris Sharp Date: Thu, 11 May 2017 18:47:32 +0000 (-0400) Subject: LP#1690206 - remove check of httpd.conf from OpenSRF Makefile.install X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=f10b7ac1bd91622bc7e91faaf1b024e64d84ad7d;p=working%2FOpenSRF.git LP#1690206 - remove check of httpd.conf from OpenSRF Makefile.install The original src/extras/Makefile.install included a grep of the file /etc/apache2/httpd.conf, which is no longer installed by default on supported Debian and Ubuntu releases. As this check results in an error message, it makes sense to remove the check altogether. Signed-off-by: Chris Sharp --- diff --git a/src/extras/Makefile.install b/src/extras/Makefile.install index 39d7ed4..10e56ef 100644 --- a/src/extras/Makefile.install +++ b/src/extras/Makefile.install @@ -200,12 +200,6 @@ debian_sys_config: # link the apache modules in for m in $(DEB_APACHE_MODS); do a2enmod $$m; done; - # adds a placeholder module so apxs will be happy - if [ ! "$$(grep mod_placeholder /etc/apache2/httpd.conf)" ]; then \ - echo -e "#\n#LoadModule mod_placeholder /usr/lib/apache2/modules/mod_placeholder.so" \ - >> /etc/apache2/httpd.conf; \ - fi; - # Install the debian-specific dependencies install_debs: $(APT_TOOL) install $(DEBS)