summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorRichard Hughes <richard@hughsie.com>2008-10-03 13:49:34 +0100
committerRichard Hughes <richard@hughsie.com>2008-10-03 13:49:34 +0100
commitddce7807fd7aa1d5e1d1041b559fa5e8f8c7bd58 (patch)
tree0dc5810cf17bc3fca702feb608f5bdf12286ee3c /etc
parent7c9ed423599d36652264b288786242f68f4c4a99 (diff)
trivial: eork around automake oddness
Diffstat (limited to 'etc')
-rw-r--r--etc/.gitignore1
-rw-r--r--etc/Makefile.am7
-rw-r--r--etc/Vendor.conf (renamed from etc/Vendor.conf.in)2
3 files changed, 6 insertions, 4 deletions
diff --git a/etc/.gitignore b/etc/.gitignore
index 3ccfb7265..3475160db 100644
--- a/etc/.gitignore
+++ b/etc/.gitignore
@@ -1,5 +1,4 @@
Makefile
Makefile.in
PackageKit.conf
-Vendor.conf
diff --git a/etc/Makefile.am b/etc/Makefile.am
index ca11e2741..352f80233 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -1,17 +1,20 @@
NULL =
confdir = $(PK_CONF_DIR)
-conf_in_files = PackageKit.conf.in Vendor.conf.in
+conf_in_files = PackageKit.conf.in
conf_DATA = $(conf_in_files:.conf.in=.conf)
$(conf_DATA): $(conf_in_files) Makefile
@sed -e "s|\@defaultbackend\@|$(DEFAULT_BACKEND)|" $< > $@
+vendordir = $(PK_CONF_DIR)
+vendor_DATA = Vendor.conf
+
EXTRA_DIST = \
$(conf_in_files) \
+ $(vendor_DATA) \
$(NULL)
DISTCLEANFILES = \
- Vendor.conf \
PackageKit.conf
diff --git a/etc/Vendor.conf.in b/etc/Vendor.conf
index 80b90328a..ed1f5a977 100644
--- a/etc/Vendor.conf.in
+++ b/etc/Vendor.conf
@@ -38,7 +38,7 @@ HardwareUrl=none
# If the value is set to 'none' then the value of DefaultUrl is used.
#
# default=none
-FontsUrl=none
+FontUrl=none
# The URL which is shown to the user when programs handing a mime tpye could not
# be found. It should probably explain how to use wine if the program is a