From 81952635d534cd4ead13070ca109596a0c3235de Mon Sep 17 00:00:00 2001 From: Doug Torrance Date: Thu, 24 Sep 2015 02:24:08 -0400 Subject: [PATCH] wmclock: Use defines to get language xpms instead of creating symlinks. --- wmclock/configure.ac | 7 +++---- wmclock/wmclock.c | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/wmclock/configure.ac b/wmclock/configure.ac index 11da724..82a2382 100644 --- a/wmclock/configure.ac +++ b/wmclock/configure.ac @@ -17,10 +17,9 @@ if test ! -d "${LangDir}"; then AC_MSG_ERROR([Cannot find language directory '${LangDir}'.]) fi -echo "configuring for ${with_lang} day-of-week and month names..." -rm -f month.xpm weekday.xpm -ln -s "./${LangDir}/month.xpm" . -ln -s "./${LangDir}/weekday.xpm" . +AC_DEFINE_UNQUOTED(MONTH_XPM, ["${LangDir}/month.xpm"]) +AC_DEFINE_UNQUOTED(WEEKDAY_XPM, ["${LangDir}/weekday.xpm"]) +AC_MSG_NOTICE([configuring for ${with_lang} day-of-week and month names...]) PKG_CHECK_MODULES([x11], [x11]) PKG_CHECK_MODULES([xpm], [xpm]) diff --git a/wmclock/wmclock.c b/wmclock/wmclock.c index eee17dd..7917917 100644 --- a/wmclock/wmclock.c +++ b/wmclock/wmclock.c @@ -109,8 +109,8 @@ #ifndef ONLY_SHAPED_WINDOW # include "clk.xpm" #endif /* !ONLY_SHAPED_WINDOW */ -#include "month.xpm" -#include "weekday.xpm" +#include MONTH_XPM +#include WEEKDAY_XPM #include "xpm/date.xpm" #include "xpm/led.xpm" #include "xpm/mask.xbm"