summaryrefslogtreecommitdiff
path: root/conf.d
diff options
context:
space:
mode:
authorAkira TAGOH <akira@tagoh.org>2013-05-13 12:14:29 +0900
committerAkira TAGOH <akira@tagoh.org>2013-05-13 12:14:29 +0900
commit93137252cfab1c38e1c9137d831c177665e0592a (patch)
treecc41761f8c2194ad9320a8d704db156b2316fe69 /conf.d
parentf6244d2cf231e1dc756f3e941e61b9bf124879bb (diff)
downloadfontconfig-93137252cfab1c38e1c9137d831c177665e0592a.tar.gz
Bug 63452 - conf.d/README outdated
reflect correct path where is configured at the build time.
Diffstat (limited to 'conf.d')
-rw-r--r--conf.d/Makefile.am11
-rw-r--r--conf.d/README.in (renamed from conf.d/README)6
2 files changed, 11 insertions, 6 deletions
diff --git a/conf.d/Makefile.am b/conf.d/Makefile.am
index 77597e5..e1fab50 100644
--- a/conf.d/Makefile.am
+++ b/conf.d/Makefile.am
@@ -21,8 +21,9 @@
# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
-DOC_FILES= \
- README
+BUILT_SOURCES = README
+DOC_SOURCES = README.in
+DOC_FILES = $(DOC_SOURCES:.in=)
CONF_LINKS = \
10-scale-bitmap-fonts.conf \
@@ -41,7 +42,8 @@ CONF_LINKS = \
80-delicious.conf \
90-synthetic.conf
-EXTRA_DIST = $(template_DATA) $(DOC_FILES)
+EXTRA_DIST = $(template_DATA) $(DOC_SOURCES)
+CLEANFILES = $(DOC_FILES)
configdir=$(CONFIGDIR)
config_DATA = $(DOC_FILES)
@@ -78,6 +80,9 @@ template_DATA = \
80-delicious.conf \
90-synthetic.conf
+README: $(srcdir)/README.in
+ sed "s|\@TEMPLATEDIR\@|$(templatedir)|" $< > $@
+
install-data-hook:
mkdir -p $(DESTDIR)$(configdir)
@(echo cd $(DESTDIR)$(configdir); \
diff --git a/conf.d/README b/conf.d/README.in
index c2fb52c..90c45de 100644
--- a/conf.d/README
+++ b/conf.d/README.in
@@ -2,9 +2,9 @@ conf.d/README
Each file in this directory is a fontconfig configuration file. Fontconfig
scans this directory, loading all files of the form [0-9][0-9]*.conf.
-These files are normally installed in ../conf.avail and then symlinked here,
-allowing them to be easily installed and then enabled/disabled by adjusting
-the symlinks.
+These files are normally installed in @TEMPLATEDIR@
+and then symlinked here, allowing them to be easily installed and then
+enabled/disabled by adjusting the symlinks.
The files are loaded in numeric order, the structure of the configuration
has led to the following conventions in usage: