--- Makefile.am.orig	2016-03-29 05:27:15.000000000 -0400
+++ Makefile.am	2016-05-25 15:55:49.302933231 -0400
@@ -4,9 +4,10 @@
 MODULESDIR=$(pkglibdir)/
 SERVICESDIR=$(pkglibdir)/
 #CONFIGDIR=$(sysconfdir)/
+LOGDIR=/var/log
+SOCKDIR=/run/icapd
+DESTDIR=
 DATADIR=$(pkgdatadir)/
-LOGDIR=$(localstatedir)/log/
-SOCKDIR=/var/run/c-icap
 
 DOXYGEN=@doxygen_bin@
 
@@ -69,7 +70,6 @@
 ALL_INCS=$(INCS:%.h=include/%.h)
 
 pkginclude_HEADERS = $(ALL_INCS)
-sysconf_DATA = c-icap.conf
 
 
 do_subst=sed -e 's%[@]SYSCONFDIR[@]%$(CONFIGDIR)%g' \
@@ -105,16 +105,10 @@
 
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(CONFIGDIR);
-	$(INSTALL) c-icap.conf $(DESTDIR)$(CONFIGDIR)/c-icap.conf.default
-	$(INSTALL) c-icap.magic $(DESTDIR)$(CONFIGDIR)/c-icap.magic.default
-	if test ! -f $(DESTDIR)$(CONFIGDIR)/c-icap.conf; then  $(INSTALL) c-icap.conf $(DESTDIR)$(CONFIGDIR)/c-icap.conf; fi
-	if test ! -f $(DESTDIR)$(CONFIGDIR)/c-icap.magic; then $(INSTALL) c-icap.magic $(DESTDIR)$(CONFIGDIR)/c-icap.magic; fi
-	$(mkinstalldirs)  $(DESTDIR)$(LOGDIR); 
-	$(mkinstalldirs)  $(DESTDIR)$(SOCKDIR);
-	chgrp nogroup $(DESTDIR)$(LOGDIR) || echo -e "*********\nWARNING! Can not set group for the log dir $(DESTDIR)$(LOGDIR)\n*********\n"
-	chmod 775 $(DESTDIR)$(LOGDIR)
-	chgrp nogroup $(DESTDIR)$(SOCKDIR) || echo -e "*********\nWARNING! Can not set group for the c-icap socket store dir $(DESTDIR)$(SOCKDIR)\n\n*********\n"
-	chmod 775 $(DESTDIR)$(SOCKDIR)
+	$(mkinstalldirs) $(DESTDIR)$(LOGDIR);
+	$(mkinstalldirs) $(DESTDIR)$(SOCKDIR);
+	$(INSTALL) c-icap.conf $(DESTDIR)$(CONFIGDIR)/c-icap.conf
+	$(INSTALL) c-icap.magic $(DESTDIR)$(CONFIGDIR)/c-icap.magic
 
 EXTRA_DIST = RECONF config-w32.h makefile.w32 c-icap.conf \
              c_icap_dll.mak c-icap.conf.in c-icap.magic  c_icap.mak c_icap.def \