diff options
| author | Dan Nicholson <dbn.lists@gmail.com> | 2009-01-19 17:02:55 -0500 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2009-02-15 13:40:16 -0800 |
| commit | c08216c6f468ce22cb7c0c1959019a7caad3484a (patch) | |
| tree | 1bb7a0dde83d5d69bddcaa59cc9a66d97c601e38 | |
| parent | 98d765a53ba33d28283e499ebd1098d27cbe6d02 (diff) | |
| download | fontconfig-c08216c6f468ce22cb7c0c1959019a7caad3484a.tar.gz | |
Let make expand fc_cachedir/FC_CACHEDIR (bug #18675)
configure replaces a NONE prefix with the default prefix too late.
So we move fonts.conf creation to Makefile, such that prefix is correctly
expanded. Ugly, but works.
| -rw-r--r-- | Makefile.am | 13 | ||||
| -rw-r--r-- | configure.in | 3 |
2 files changed, 13 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index e982dd2..ec7a5d9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -32,6 +32,7 @@ EXTRA_DIST = \ fontconfig.spec.in \ fontconfig.spec \ fontconfig-zip.in +CLEANFILES = fonts.conf DISTCLEANFILES = config.cache ChangeLog doltcompile MAINTAINERCLEANFILES = \ $(srcdir)/aclocal.m4 \ @@ -81,7 +82,17 @@ ChangeLog: .PHONY: ChangeLog -install-data-local: +fonts.conf: fonts.conf.in Makefile + sed \ + -e 's,@FC_CACHEDIR\@,$(FC_CACHEDIR),g' \ + -e 's,@FC_DEFAULT_FONTS\@,$(FC_DEFAULT_FONTS),g' \ + -e 's,@FC_FONTPATH\@,$(FC_FONTPATH),g' \ + -e 's,@PACKAGE\@,$(PACKAGE),g' \ + -e 's,@VERSION\@,$(VERSION),g' \ + $< > $@.tmp && \ + mv $@.tmp $@ + +install-data-local: fonts.conf $(mkinstalldirs) $(DESTDIR)$(configdir) $(DESTDIR)$(fc_cachedir) if [ -f $(DESTDIR)$(configdir)/fonts.conf ]; then \ echo "backing up existing $(DESTDIR)$(configdir)/fonts.conf"; \ diff --git a/configure.in b/configure.in index bbca05a..7a40ada 100644 --- a/configure.in +++ b/configure.in @@ -455,7 +455,7 @@ no|yes) if test "$os_win32" = "yes"; then fc_cachedir="WINDOWSTEMPDIR_FONTCONFIG_CACHE" else - fc_cachedir=`eval echo "${localstatedir}/cache/"${PACKAGE}` + fc_cachedir='${localstatedir}/cache/${PACKAGE}' fi ;; *) @@ -571,6 +571,5 @@ doc/version.sgml test/Makefile fontconfig.spec fontconfig.pc -fonts.conf fontconfig-zip ]) |