From bf0c80fc4996157dda7bed8b8b2e4c8a13611ada Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Thu, 31 Aug 2006 18:14:45 -0700 Subject: [PATCH] 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. --- fc-cache/Makefile.am | 6 ++---- fc-cat/Makefile.am | 2 -- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/fc-cache/Makefile.am b/fc-cache/Makefile.am index 3700c4a..4bb767b 100644 --- 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 1730641..91e5ad7 100644 --- 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 -- 2.39.5