diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2007-08-21 19:33:00 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2007-08-21 19:33:00 -0700 |
| commit | a9ccf1bd91ad6e06f7b7116efe836c365b68645b (patch) | |
| tree | dd3ba574f24c6afb94294c7c9ba7fc22056c2828 | |
| parent | 110131bd40d0fc042f4a81922372307a1582b591 (diff) | |
Use cursorpath found by configure in man page
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | man/Makefile.am | 11 | ||||
| -rw-r--r-- | man/Xcursor.man | 7 |
3 files changed, 20 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 6376ef5..18ca5db 100644 --- a/configure.ac +++ b/configure.ac @@ -51,7 +51,10 @@ AC_ARG_WITH(icondir, [ICONDIR=${datadir}/icons]) AC_SUBST([ICONDIR]) -DEF_CURSORPATH="~/.icons:${datadir}/icons:${datadir}/pixmaps:$ICONDIR" +DEF_CURSORPATH="~/.icons:${datadir}/icons:${datadir}/pixmaps" +if test "x${ICONDIR}" != "x${datadir}/icons"; then + DEF_CURSORPATH="${DEF_CURSORPATH}:${ICONDIR}" +fi AC_ARG_WITH(cursorpath, AC_HELP_STRING([--with-cursorpath=<paths>], [Set default search path for cursors]), @@ -59,6 +62,10 @@ 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]) + # Check for X 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 725a676..e8ddd70 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -13,6 +13,15 @@ SUFFIXES = .$(LIB_MAN_SUFFIX) .man # Strings to replace in man pages XORGRELSTRING = @PACKAGE_STRING@ +MAN_SUBSTS = \ + -e 's|__xorgversion__|"$(XORGRELSTRING)"|' \ + -e 's|__XCURSORPATH__|$(XCURSORPATH_LIST)|g' \ + -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ + -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \ + -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ + -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ + -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' + .man.$(LIB_MAN_SUFFIX): -rm -f $@ - sed 's/__xorgversion__/"$(XORGRELSTRING)"/; s/__LIB_MAN_SUFFIX__/$(LIB_MAN_SUFFIX)/; s%__prefix__%$(prefix)%g; s%__ICONDIR__%$(ICONDIR)%g' < $< > $@ + sed $(MAN_SUBSTS) < $< > $@ diff --git a/man/Xcursor.man b/man/Xcursor.man index fd39be8..610452d 100644 --- a/man/Xcursor.man +++ b/man/Xcursor.man @@ -1,6 +1,4 @@ .\" -.\" $Id$ -.\" .\" Copyright © 2002 Keith Packard .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -26,7 +24,7 @@ .ns .TP \\$1 .. -.TH XCURSOR __LIB_MAN_SUFFIX__ __xorgversion__ "Keith Packard" +.TH XCURSOR __libmansuffix__ __xorgversion__ "Keith Packard" .SH NAME XCURSOR \- Cursor management library @@ -142,8 +140,7 @@ Images look like: .SS THEMES Xcursor (mostly) follows the freedesktop.org spec for theming icons. The -default search path it uses is $HOME/.icons, __prefix__/share/icons, -__prefix__/share/pixmaps, __ICONDIR__. Within each of these +default search path it uses is __XCURSORPATH__. Within each of these directories, it searches for a directory using the theme name. Within the theme directory, it looks for cursor files in the 'cursors' subdirectory. It uses the first cursor file found along the path. |