Change $(pkgcachedir) to $(fc_cachedir) in fc-cat and fc-cache Makefile.am

make distcheck caught this bug; the effect of 'make uninstall'
would have been to execute 'rm -rf /', somewhat less that desirable.

diff --git a/fc-cache/Makefile.am b/fc-cache/Makefile.am
index 3700c4ad54e102444b99bf45bce49d3831086cf6..4bb767bb7bcb9ae8234c1c1acd8ee917369d329a 100644 (file)
--- a/fc-cache/Makefile.am
+++ b/fc-cache/Makefile.am
@@ -27,13 +27,11 @@ FC_CACHE_SRC=${top_srcdir}/fc-cache
 
 SGML = ${FC_CACHE_SRC}/fc-cache.sgml
 
-AM_CPPFLAGS = -DPKGCACHEDIR='"${pkgcachedir}"'
-
 install-data-local:
-       -$(mkinstalldirs) "$(DESTDIR)$(pkgcachedir)"
+       -$(mkinstalldirs) "$(DESTDIR)$(fc_cachedir)"
 
 uninstall-local:
-       -$(RM) -rf "$(DESTDIR)$(pkgcachedir)"
+       -$(RM) -rf "$(DESTDIR)$(fc_cachedir)"
 
 INCLUDES=-I${top_srcdir} -I${top_srcdir}/src $(FREETYPE_CFLAGS)
 

diff --git a/fc-cat/Makefile.am b/fc-cat/Makefile.am
index 1730641b1565bbe2a98d2060ad4c253f4a252164..91e5ad720baf69e46a3d7edd83b96b5aa2cfc52c 100644 (file)
--- a/fc-cat/Makefile.am
+++ b/fc-cat/Makefile.am
@@ -27,8 +27,6 @@ FC_CAT_SRC=${top_srcdir}/fc-cat
 
 SGML = ${FC_CAT_SRC}/fc-cat.sgml
 
-AM_CPPFLAGS = -DPKGCACHEDIR='"${pkgcachedir}"'
-
 INCLUDES=-I${top_srcdir} $(FREETYPE_CFLAGS)
 
 bin_PROGRAMS=fc-cat