moved fluxstyle.1 to fluxstyle.1.in and using regexp to replace pkgdatadir, patch from php-coder

2 files changed, 7 insertions, 4 deletions

diff --git a/doc/Makefile.am b/doc/Makefile.am
index f8056ea..13d3c3b 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -2,14 +2,17 @@
 # Makefile.am for fluxbox/doc
 
 SUBDIRS = ru
-CLEANFILES = fluxbox.1
+CLEANFILES = fluxbox.1 fluxstyle.1
 MAINTAINERCLEANFILES = Makefile.in
 man_MANS = fluxbox.1 bsetroot.1 fbrun.1 fbsetbg.1 \
         startfluxbox.1 fluxstyle.1 fbrun.1 
 EXTRA_DIST=fluxbox.1.in bsetroot.1 fbrun.1 startfluxbox.1 fbsetbg.1 \
-        fluxstyle.1 Coding_style
+        fluxstyle.1.in Coding_style
 distclean-local:
         rm -f *\~
 
 fluxbox.1: fluxbox.1.in
         @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir)," $(srcdir)/fluxbox.1.in > fluxbox.1
+
+fluxstyle.1: fluxstyle.1.in
+        @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir)," $(srcdir)/fluxstyle.1.in > fluxstyle.1
diff --git a/doc/fluxstyle.1 b/doc/fluxstyle.1.in
index ede3946..d0c7f33 100644
--- a/doc/fluxstyle.1
+++ b/doc/fluxstyle.1.in
@@ -55,7 +55,7 @@ The default installation of Fluxbox is shipped with many classic styles that
 show the customization of current Fluxbox versions. They are usually located in
 .IR ~/.fluxbox/styles
 and in the global Fluxbox share directory
-.IR /usr/local/share/fluxbox/styles
+.IR @pkgdatadir@/styles
 which may vary depending on the method of installation used. To use one of
 the styles shipped with Fluxbox, look in your root menu under the configure
 part of the menu for 'System Styles'.
@@ -99,7 +99,7 @@ We'll cover quickly where styles can be found and placed after you create your o
 There are a number of default styles that come with the installation, while we have already
 covered this, we will again just provide a central location for all style locations.  These
 default styles are located in
-.IR /usr/local/share/fluxbox/styles
+.IR @pkgdatadir@/styles
 providing a default configureation at installation.
 .PP
 Once you create your own, you can create a directory in