aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2004-08-12 10:13:34 (GMT)
committerfluxgen <fluxgen>2004-08-12 10:13:34 (GMT)
commitee8133542e7aace04d0305417c9d24cb44b0d63e (patch)
treec10823d7c51a4a6e62cc218e084625078cfecae0
parent9a0c97b5417cb2b4921c227c0d26e1ba47101919 (diff)
downloadfluxbox_paul-ee8133542e7aace04d0305417c9d24cb44b0d63e.zip
fluxbox_paul-ee8133542e7aace04d0305417c9d24cb44b0d63e.tar.bz2
moved fluxstyle.1 to fluxstyle.1.in and using regexp to replace pkgdatadir, patch from php-coder
-rw-r--r--doc/Makefile.am7
-rw-r--r--doc/fluxstyle.1.in (renamed from doc/fluxstyle.1)4
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 @@
2# Makefile.am for fluxbox/doc 2# Makefile.am for fluxbox/doc
3 3
4SUBDIRS = ru 4SUBDIRS = ru
5CLEANFILES = fluxbox.1 5CLEANFILES = fluxbox.1 fluxstyle.1
6MAINTAINERCLEANFILES = Makefile.in 6MAINTAINERCLEANFILES = Makefile.in
7man_MANS = fluxbox.1 bsetroot.1 fbrun.1 fbsetbg.1 \ 7man_MANS = fluxbox.1 bsetroot.1 fbrun.1 fbsetbg.1 \
8 startfluxbox.1 fluxstyle.1 fbrun.1 8 startfluxbox.1 fluxstyle.1 fbrun.1
9EXTRA_DIST=fluxbox.1.in bsetroot.1 fbrun.1 startfluxbox.1 fbsetbg.1 \ 9EXTRA_DIST=fluxbox.1.in bsetroot.1 fbrun.1 startfluxbox.1 fbsetbg.1 \
10 fluxstyle.1 Coding_style 10 fluxstyle.1.in Coding_style
11distclean-local: 11distclean-local:
12 rm -f *\~ 12 rm -f *\~
13 13
14fluxbox.1: fluxbox.1.in 14fluxbox.1: fluxbox.1.in
15 @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir)," $(srcdir)/fluxbox.1.in > fluxbox.1 15 @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir)," $(srcdir)/fluxbox.1.in > fluxbox.1
16
17fluxstyle.1: fluxstyle.1.in
18 @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
55show the customization of current Fluxbox versions. They are usually located in 55show the customization of current Fluxbox versions. They are usually located in
56.IR ~/.fluxbox/styles 56.IR ~/.fluxbox/styles
57and in the global Fluxbox share directory 57and in the global Fluxbox share directory
58.IR /usr/local/share/fluxbox/styles 58.IR @pkgdatadir@/styles
59which may vary depending on the method of installation used. To use one of 59which may vary depending on the method of installation used. To use one of
60the styles shipped with Fluxbox, look in your root menu under the configure 60the styles shipped with Fluxbox, look in your root menu under the configure
61part of the menu for 'System Styles'. 61part 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
99There are a number of default styles that come with the installation, while we have already 99There are a number of default styles that come with the installation, while we have already
100covered this, we will again just provide a central location for all style locations. These 100covered this, we will again just provide a central location for all style locations. These
101default styles are located in 101default styles are located in
102.IR /usr/local/share/fluxbox/styles 102.IR @pkgdatadir@/styles
103providing a default configureation at installation. 103providing a default configureation at installation.
104.PP 104.PP
105Once you create your own, you can create a directory in 105Once you create your own, you can create a directory in