From 173bdbce9896aec108390f9eed8de6f8874223e5 Mon Sep 17 00:00:00 2001 From: Ademar de Souza Reis Jr Date: Wed, 20 Jun 2007 13:31:05 -0300 Subject: [PATCH] Add catalogue: to default configuration using a non xfs dependent location, so that it can be used by xserver and others as well. --- Makefile.am | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/Makefile.am b/Makefile.am index 7c5c913..cb096ee 100644 --- a/Makefile.am +++ b/Makefile.am @@ -95,9 +95,12 @@ appman_PRE = \ FSERRORS = /var/log/xfs.log +cataloguedir = $(configdir)/fontpath.d +catalogue_DATA = # XXX, empty so that the dir is created + FONTDIR = $(libdir)/X11/fonts -FONTPATH = $(FONTDIR)/misc/,$(FONTDIR)/TTF/,$(FONTDIR)/Type1/,$(FONTDIR)/CID/,$(FONTDIR)/100dpi/,$(FONTDIR)/75dpi/ +FONTPATH = catalogue:$(cataloguedir)/,$(FONTDIR)/misc/,$(FONTDIR)/TTF/,$(FONTDIR)/Type1/,$(FONTDIR)/CID/,$(FONTDIR)/100dpi/,$(FONTDIR)/75dpi/ config: config.cpp sed -e s/XCOMM/\#/ -e s@DEFAULTFONTPATH@$(FONTPATH)@ -e s@FSERRORS@$(FSERRORS)@ < $(top_srcdir)/config.cpp > config @@ -128,6 +131,7 @@ MAN_SUBSTS = \ -e 's|__projectroot__|$(prefix)|g' \ -e 's|__apploaddir__|$(appdefaultdir)|' \ -e 's|__configdir__|$(configdir)|' \ + -e 's|__cataloguedir__|$(cataloguedir)|g' \ -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \ -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ -- 1.5.2.2