walkero
/
fontconfig
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bug 63452 - conf.d/README outdated 

reflect correct path where is configured at the build time.
This commit is contained in:
Akira TAGOH 2013-05-13 12:14:29 +09:00
parent f6244d2cf2
commit 93137252cf
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
conf.d/Makefile.am
View File

@ -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); \

6
conf.d/README → conf.d/README.in
View File

@ -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: