summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorMukund Sivaraman <muks@banu.com>2011-08-23 14:46:04 +0530
committerMukund Sivaraman <muks@banu.com>2011-08-23 14:46:04 +0530
commit32563a4ed68b6dae29f37c024bca246db7d7e029 (patch)
tree9d21f05a6751388a022b62e40da2d34b8dafd487 /etc
parentec86c15d5a57df34e13149a878cb3f2be8819f06 (diff)
downloadtinyproxy-32563a4ed68b6dae29f37c024bca246db7d7e029.tar.gz
tinyproxy-32563a4ed68b6dae29f37c024bca246db7d7e029.zip
Bug #103: Move files installed in /etc/ to /etc/tinyproxy/
Diffstat (limited to 'etc')
-rw-r--r--etc/Makefile.am6
-rw-r--r--etc/tinyproxy.conf.in2
2 files changed, 5 insertions, 3 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.