From 40311c7af9274b644092e15ae57717f5000257fe Mon Sep 17 00:00:00 2001 From: Ademar de Souza Reis Jr Date: Wed, 4 Jul 2007 18:12:55 -0300 Subject: [PATCH] use AC_DEFINE_DIR(XPRINTDIR, ...) for xpconfigdir Notice that xpconfigdir is used extensively, so this change alone won't have much effect --- configure.ac | 1 + cpprules.in | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index 3ec9aea..60125cb 100644 --- a/configure.ac +++ b/configure.ac @@ -1597,6 +1597,7 @@ if test "x$XPRINT" = xyes; then [ xpconfigdir="$withval" ], [ xpconfigdir="$sysconfdir/X11/xprint" ]) AC_SUBST([xpconfigdir]) + AC_DEFINE_DIR(XPRINTDIR, xpconfigdir, [Directory to store xprint configuration data]) AC_PATH_PROG(MKFONTSCALE, mkfontscale) AC_PATH_PROG(MKFONTDIR, mkfontdir) diff --git a/cpprules.in b/cpprules.in index 08da5fa..1eb5eca 100644 --- a/cpprules.in +++ b/cpprules.in @@ -38,7 +38,7 @@ MANDEFS = \ -D__projectroot__=$(prefix) \ -D__xconfigfile__=$(__XCONFIGFILE__) -D__xconfigdir__=$(XCONFIGDIR) \ -D__xlogfile__=$(XLOGFILE) -D__xservername__=$(XSERVERNAME) \ - -D__xprintdir__=@xpconfigdir@ + -D__xprintdir__=$(XPRINTDIR) .pre: $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ -- 1.5.2.2