From 32563a4ed68b6dae29f37c024bca246db7d7e029 Mon Sep 17 00:00:00 2001
From: Mukund Sivaraman <muks@banu.com>
Date: Tue, 23 Aug 2011 14:46:04 +0530
Subject: Bug #103: Move files installed in /etc/ to /etc/tinyproxy/

---
 etc/Makefile.am       | 6 ++++--
 etc/tinyproxy.conf.in | 2 +-
 src/Makefile.am       | 4 +++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/etc/Makefile.am b/etc/Makefile.am
index 9cf6d5c..57a5c01 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -1,4 +1,6 @@
-sysconf_DATA = \
+pkgsysconfdir = $(sysconfdir)/$(PACKAGE)
+
+pkgsysconf_DATA = \
 	tinyproxy.conf
 
 EXTRA_DIST = \
@@ -8,7 +10,7 @@ edit = sed \
 	-e 's|@bindir[@]|$(bindir)|g' \
 	-e 's|@datadir[@]|$(datadir)|g' \
 	-e 's|@datarootdir[@]|$(datarootdir)|g' \
-	-e 's|@sysconfdir[@]|$(sysconfdir)|g' \
+	-e 's|@pkgsysconfdir[@]|$(pkgsysconfdir)|g' \
 	-e 's|@localstatedir[@]|$(localstatedir)|g' \
 	-e 's|@pkgdatadir[@]|$(pkgdatadir)|g' \
 	-e 's|@prefix[@]|$(prefix)|g' \
diff --git a/etc/tinyproxy.conf.in b/etc/tinyproxy.conf.in
index e4eeb91..e24ad4a 100644
--- a/etc/tinyproxy.conf.in
+++ b/etc/tinyproxy.conf.in
@@ -236,7 +236,7 @@ ViaProxyName "tinyproxy"
 #
 # Filter: This allows you to specify the location of the filter file.
 #
-#Filter "@sysconfdir@/filter"
+#Filter "@pkgsysconfdir@/filter"
 
 #
 # FilterURLs: Filter based on URLs rather than domains.
diff --git a/src/Makefile.am b/src/Makefile.am
index 8358ef1..a1fe63d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,10 +15,12 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+pkgsysconfdir = $(sysconfdir)/$(PACKAGE)
+
 sbin_PROGRAMS = tinyproxy
 
 AM_CPPFLAGS = \
-	-DSYSCONFDIR=\"${sysconfdir}\" \
+	-DSYSCONFDIR=\"${pkgsysconfdir}\" \
 	-DLOCALSTATEDIR=\"${localstatedir}\"
 
 tinyproxy_SOURCES = \
-- 
cgit v1.2.3