[oe-commits] Roman I Khimov : squid: move config files to /etc/squid

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 0d3929882b1b6743883fbe574886a90c3efa5a2d
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=0d3929882b1b6743883fbe574886a90c3efa5a2d

Author: Roman I Khimov <khimov at altell.ru>
Date:   Fri Mar 19 13:01:20 2010 +0300

squid: move config files to /etc/squid

Squid installs 5 files into /etc so it deserves a separate dir for it.
Similar setup is used by other distros.

Signed-off-by: Roman I Khimov <khimov at altell.ru>

---

 recipes/squid/squid.inc |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/recipes/squid/squid.inc b/recipes/squid/squid.inc
index 7fb3543..b5878c3 100644
--- a/recipes/squid/squid.inc
+++ b/recipes/squid/squid.inc
@@ -1,6 +1,6 @@
 DESCRIPTION = "Squid is a caching proxy for the Web supporting HTTP, HTTPS, FTP, and more"
 LICENSE = "GPLv2"
-INC_PR = "r1"
+INC_PR = "r2"
 DEPENDS = "squid-native-${PV}"
 
 SRC_URI = "http://www.squid-cache.org/Versions/v2/${SQUID_MAJOR}/squid-${PV}.tar.bz2 \
@@ -18,6 +18,9 @@ EXTRA_OEMAKE = "\
   DEFAULT_STORE_LOG=${logdir}/store.log \
   DEFAULT_PID_FILE=${localstatedir}/run/squid.pid \
   DEFAULT_SWAP_DIR=${localstatedir}/spool/squid \
+  DEFAULT_CONFIG_FILE=${sysconfdir}/squid/squid.conf \
+  DEFAULT_MIME_TABLE=${sysconfdir}/squid/mime.conf \
+  DEFAULT_CACHEMGR_CONFIG=${sysconfdir}/squid/cachemgr.conf \
   "
 
 INITSCRIPT_NAME = "squid"
@@ -26,9 +29,15 @@ do_configure_append() {
    sed -i -e 's|./cf_gen |${STAGING_BINDIR_NATIVE}/cf_gen |g' src/Makefile
 }
 
+do_install_prepend() {
+	install -d ${D}${sysconfdir}/squid
+}
+
 do_install_append() {
 	install -d ${D}${sysconfdir}/init.d
 	install -m 755 ${WORKDIR}/squid.init ${D}${sysconfdir}/init.d/squid
+	mv ${D}${sysconfdir}/mime.conf.default ${D}${sysconfdir}/squid/
+	mv ${D}${sysconfdir}/squid.conf.default ${D}${sysconfdir}/squid/
 }
 
 # this packages the languages better and saves some space, installs