diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2011-02-02 17:08:19 -0500 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2011-02-02 17:08:19 -0500 |
| commit | de50317ec4e0e8da7de84e85d1f7a6d2e184d58b (patch) | |
| tree | f6c2dafedc2878018695dd5feacec6b5bbd19165 | |
| parent | a929c3621b9da8e56ce1223afd3e487fc488fa47 (diff) | |
config: perform XCURSORPATH formatting in man/Makefile.am
We can skip the extra step of using XCURSORPATH_LIST in configure.ac.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | man/Makefile.am | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index c990200..a3add56 100644 --- a/configure.ac +++ b/configure.ac @@ -64,10 +64,6 @@ AC_ARG_WITH(cursorpath, [XCURSORPATH=$DEF_CURSORPATH]) AC_SUBST([XCURSORPATH]) -# Reformat cursor path for man page -XCURSORPATH_LIST=`echo $XCURSORPATH | sed 's/:/, /g'` -AC_SUBST([XCURSORPATH_LIST]) - # Obtain compiler/linker options for depedencies PKG_CHECK_MODULES(XCURSOR, xrender >= 0.8.2 xfixes x11 fixesproto) AC_DEFINE(HAVE_XFIXES, 1, [Define to 1 if you have Xfixes]) diff --git a/man/Makefile.am b/man/Makefile.am index 0be4444..f3f4599 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -45,7 +45,9 @@ CLEANFILES = $(libman_DATA) SUFFIXES = .$(LIB_MAN_SUFFIX) .man # String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure -MAN_SUBSTS += -e 's|__XCURSORPATH__|$(XCURSORPATH_LIST)|g' +# 's/:/, /g' will add comma and a space to help path formatting +MAN_SUBSTS += -e 's|__XCURSORPATH__|$(XCURSORPATH)|g' \ + -e '\|$(XCURSORPATH)| s/:/, /g' .man.$(LIB_MAN_SUFFIX): $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ |