dont hardcode the paths in the man pages. add the docbook-to-man parsed stuff to...

diff --git a/Makefile.am b/Makefile.am
index 16fef2b9b71e9aa13d7cc7967fd678ae55305ca3..8fad996c1946b2bff8e68d84a41a9e33527d2920 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -414,25 +414,15 @@ data/xsession/openbox-session: \
        @$(edit) $< >$@
        @chmod a+x $@
 
        @$(edit) $< >$@
        @chmod a+x $@
 

-doc/openbox.1: $(srcdir)/doc/openbox.1.sgml
+%.1.in: %.1.sgml

        @echo make: creating $@
        @mkdir doc 2>/dev/null || true
        @echo make: creating $@
        @mkdir doc 2>/dev/null || true

-       @$(edit) $< | docbook-to-man - >$@
+       @docbook-to-man $< >$@

 
 

-doc/openbox-session.1: $(srcdir)/doc/openbox-session.1.sgml
+%.1: %.1.in

        @echo make: creating $@
        @mkdir doc 2>/dev/null || true
        @echo make: creating $@
        @mkdir doc 2>/dev/null || true

-       @$(edit) $< | docbook-to-man - >$@
-
-doc/openbox-gnome-session.1: $(srcdir)/doc/openbox-gnome-session.1.sgml
-       @echo make: creating $@
-       @mkdir doc 2>/dev/null || true
-       @$(edit) $< | docbook-to-man - >$@
-
-doc/openbox-kde-session.1: $(srcdir)/doc/openbox-kde-session.1.sgml
-       @echo make: creating $@
-       @mkdir doc 2>/dev/null || true
-       @$(edit) $< | docbook-to-man - >$@
+       @$(edit) $< >$@ 

 
 dist_gnomewmfiles_DATA = \
        data/gnome-wm-properties/openbox.desktop
 
 dist_gnomewmfiles_DATA = \
        data/gnome-wm-properties/openbox.desktop


@@ -454,9 +444,13 @@ dist_noinst_DATA = \
        data/xsession/openbox-gnome-session.in \
        data/xsession/openbox-kde-session.in \
        doc/openbox.1.sgml \
        data/xsession/openbox-gnome-session.in \
        data/xsession/openbox-kde-session.in \
        doc/openbox.1.sgml \

+       doc/openbox.1.in \

        doc/openbox-session.1.sgml \
        doc/openbox-session.1.sgml \

+       doc/openbox-session.1.in \

        doc/openbox-gnome-session.1.sgml \
        doc/openbox-gnome-session.1.sgml \

+       doc/openbox-gnome-session.1.in \

        doc/openbox-kde-session.1.sgml \
        doc/openbox-kde-session.1.sgml \

+       doc/openbox-kde-session.1.in \

        render/obrender-3.0.pc.in \
        parser/obparser-3.0.pc.in \
        tools/themeupdate/themeupdate.py \
        render/obrender-3.0.pc.in \
        parser/obparser-3.0.pc.in \
        tools/themeupdate/themeupdate.py \

diff --git a/doc/openbox-gnome-session.1 b/doc/openbox-gnome-session.1.in
similarity index 88%
rename from doc/openbox-gnome-session.1
rename to doc/openbox-gnome-session.1.in
index 68e29f7bb972773b5e2c1a2e8114a8e99379ed24..bff2570ee7f15679938d69a99e7c176fba318811 100644 (file)
--- a/doc/openbox-gnome-session.1
+++ b/doc/openbox-gnome-session.1.in
@@ -16,4 +16,4 @@ The program's full documentation is available on the website:
 .PP 
 Please report bugs to: \fBhttp://bugzilla.icculus.org/ 
 \fP 
 .PP 
 Please report bugs to: \fBhttp://bugzilla.icculus.org/ 
 \fP 

-.\" created by instant / docbook-to-man, Mon 14 May 2007, 21:59 
+.\" created by instant / docbook-to-man, Tue 15 May 2007, 20:08 

diff --git a/doc/openbox-kde-session.1 b/doc/openbox-kde-session.1.in
similarity index 87%
rename from doc/openbox-kde-session.1
rename to doc/openbox-kde-session.1.in
index e877cb0f1f8b734850bc8338b86e231d46546186..aa040cfcf78dd8c9d710c6efac5089a778549db4 100644 (file)
--- a/doc/openbox-kde-session.1
+++ b/doc/openbox-kde-session.1.in
@@ -16,4 +16,4 @@ The program's full documentation is available on the website:
 .PP 
 Please report bugs to: \fBhttp://bugzilla.icculus.org/ 
 \fP 
 .PP 
 Please report bugs to: \fBhttp://bugzilla.icculus.org/ 
 \fP 

-.\" created by instant / docbook-to-man, Mon 14 May 2007, 21:59 
+.\" created by instant / docbook-to-man, Tue 15 May 2007, 20:08 

diff --git a/doc/openbox-session.1 b/doc/openbox-session.1.in
similarity index 81%
rename from doc/openbox-session.1
rename to doc/openbox-session.1.in
index 1aded857c5462254afb7433dfbe1aa7850d28df8..58b4bafdf62c0e3922af62414f90cfd90fe97f6e 100644 (file)
--- a/doc/openbox-session.1
+++ b/doc/openbox-session.1.in
@@ -10,7 +10,7 @@ to save your state from one log in to the next.
 .PP 
 On log in, \fBopenbox-session\fR will run the 
 ~/.config/openbox/autostart.sh script if it exists, and will run the 
 .PP 
 On log in, \fBopenbox-session\fR will run the 
 ~/.config/openbox/autostart.sh script if it exists, and will run the 

-system-wide script /opt/openbox/etc/xdg/openbox/autostart.sh otherwise. You may 
+system-wide script @configdir@/openbox/autostart.sh otherwise. You may 

 place anything you want to run automatically in those files, for example: 
  
 .PP 
 place anything you want to run automatically in those files, for example: 
  
 .PP 


@@ -24,7 +24,7 @@ gnome-settings-daemon &
 .PP 
 Make sure that each line is followed by a "&" or else the script will 
 stop there and further commands will not be executed. You can use the 
 .PP 
 Make sure that each line is followed by a "&" or else the script will 
 stop there and further commands will not be executed. You can use the 

-/opt/openbox/etc/xdg/openbox/autostart.sh file as an example for creating your 
+@configdir@/openbox/autostart.sh file as an example for creating your 

 own. 
 .SH "SEE ALSO" 
 .PP 
 own. 
 .SH "SEE ALSO" 
 .PP 


@@ -36,4 +36,4 @@ The program's full documentation is available on the website:
 .PP 
 Please report bugs to: \fBhttp://bugzilla.icculus.org/ 
 \fP 
 .PP 
 Please report bugs to: \fBhttp://bugzilla.icculus.org/ 
 \fP 

-.\" created by instant / docbook-to-man, Mon 14 May 2007, 22:02 
+.\" created by instant / docbook-to-man, Tue 15 May 2007, 20:08 

diff --git a/doc/openbox.1 b/doc/openbox.1.in
similarity index 89%
rename from doc/openbox.1
rename to doc/openbox.1.in
index 7416b0816c41eb8bacfc3f84e9d3b24cb47a295d..d7387ac5402b1372b8650a5fd81168ae783ff201 100644 (file)
--- a/doc/openbox.1
+++ b/doc/openbox.1.in
@@ -21,7 +21,7 @@ launch GNOME or KDE with Openbox as the window manager.
 .PP 
 The third option at log in, which is \fBOpenbox\fR       without a session manager, uses the \fBopenbox-session\fR       command to start Openbox. On log in, \fBopenbox\fR will 
 run the ~/.config/openbox/autostart.sh script if it exists, and will run 
 .PP 
 The third option at log in, which is \fBOpenbox\fR       without a session manager, uses the \fBopenbox-session\fR       command to start Openbox. On log in, \fBopenbox\fR will 
 run the ~/.config/openbox/autostart.sh script if it exists, and will run 

-the system-wide script /opt/openbox/etc/xdg/openbox/autostart.sh otherwise. You 
+the system-wide script @configdir@/openbox/autostart.sh otherwise. You 

 may place anything you want to run automatically in those files, for 
 example: 
  
 may place anything you want to run automatically in those files, for 
 example: 
  


@@ -36,10 +36,10 @@ gnome-settings-daemon &
 .PP 
 Make sure that each line is followed by a "&" or else the script will 
 stop there and further commands will not be executed. You can use the 
 .PP 
 Make sure that each line is followed by a "&" or else the script will 
 stop there and further commands will not be executed. You can use the 

-/opt/openbox/etc/xdg/openbox/autostart.sh file as an example for creating your 
+@configdir@/openbox/autostart.sh file as an example for creating your 

 own. 
 .PP 
 own. 
 .PP 

-The default /opt/openbox/etc/xdg/openbox/autostart.sh runs a number of things 
+The default @configdir@/openbox/autostart.sh runs a number of things 

 with Openbox. 
 .PP 
 Lastly, if you use \fBstartx\fR to launch your X 
 with Openbox. 
 .PP 
 Lastly, if you use \fBstartx\fR to launch your X 


@@ -54,7 +54,7 @@ is possible by editing the configuration files by hand. Please note that
 for you. 
 .PP 
 The default configuration and menu files are installed in 
 for you. 
 .PP 
 The default configuration and menu files are installed in 

-/opt/openbox/etc/xdg/openbox/, and the user configuration is placed in 
+@configdir@/openbox/, and the user configuration is placed in 

 ~/.config/openbox/. You can copy the default configuration and menus 
 to ~/.config/openbox and edit it to your liking. 
 .SH "OPTIONS" 
 ~/.config/openbox/. You can copy the default configuration and menus 
 to ~/.config/openbox and edit it to your liking. 
 .SH "OPTIONS" 


@@ -91,4 +91,4 @@ The program's full documentation is available on the website:
 .PP 
 Please report bugs to: \fBhttp://bugzilla.icculus.org/ 
 \fP 
 .PP 
 Please report bugs to: \fBhttp://bugzilla.icculus.org/ 
 \fP 

-.\" created by instant / docbook-to-man, Mon 14 May 2007, 22:02 
+.\" created by instant / docbook-to-man, Tue 15 May 2007, 20:08