summaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
Diffstat (limited to 'util')
-rw-r--r--util/Makefile.am5
-rwxr-xr-xutil/startfluxbox.in8
2 files changed, 9 insertions, 4 deletions
diff --git a/util/Makefile.am b/util/Makefile.am
index 58a232f..53a61d7 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -11,6 +11,9 @@ MAINTAINERCLEANFILES= Makefile.in
11EXTRA_DIST= fbsetbg fluxbox-generate_menu.in \ 11EXTRA_DIST= fbsetbg fluxbox-generate_menu.in \
12 startfluxbox.in 12 startfluxbox.in
13 13
14PROGRAM_PREFIX=@program_prefix@
15PROGRAM_SUFFIX=@program_suffix@
16
14all-local: startfluxbox 17all-local: startfluxbox
15 18
16clean-local: 19clean-local:
@@ -22,6 +25,8 @@ fbsetroot.o: fbsetroot.cc ../config.h $(srcdir)/fbsetroot.hh \
22startfluxbox: startfluxbox.in 25startfluxbox: startfluxbox.in
23 @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir),g" \ 26 @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir),g" \
24 -e "s,@pkgbindir@,$(bindir),g" \ 27 -e "s,@pkgbindir@,$(bindir),g" \
28 -e "s,@pkgprefix@,$(PROGRAM_PREFIX:NONE=),g" \
29 -e "s,@pkgsuffix@,$(PROGRAM_SUFFIX:NONE=),g" \
25 $(srcdir)/startfluxbox.in > startfluxbox 30 $(srcdir)/startfluxbox.in > startfluxbox
26 -chmod 755 startfluxbox 31 -chmod 755 startfluxbox
27 32
diff --git a/util/startfluxbox.in b/util/startfluxbox.in
index c17304b..4209be9 100755
--- a/util/startfluxbox.in
+++ b/util/startfluxbox.in
@@ -44,10 +44,10 @@ else
44# 44#
45# This sets a black background 45# This sets a black background
46 46
47@pkgbindir@/fbsetroot -solid black 47@pkgbindir@/@pkgprefix@fbsetroot@pkgsuffix@ -solid black
48 48
49# This shows the fluxbox-splash-screen 49# This shows the fluxbox-splash-screen
50# fbsetbg -C @pkgdatadir@/splash.jpg 50# @pkgprefix@fbsetbg@pkgsuffix@ -C @pkgdatadir@/splash.jpg
51 51
52# Other examples. Check man xset for details. 52# Other examples. Check man xset for details.
53# 53#
@@ -79,9 +79,9 @@ else
79# And last but not least we start fluxbox. 79# And last but not least we start fluxbox.
80# Because it is the last app you have to run it with ''exec'' before it. 80# Because it is the last app you have to run it with ''exec'' before it.
81 81
82exec @pkgbindir@/fluxbox 82exec @pkgbindir@/@pkgprefix@fluxbox@pkgsuffix@
83# or if you want to keep a log: 83# or if you want to keep a log:
84# exec @pkgbindir@/fluxbox -log "$HOME/.fluxbox/log" 84# exec @pkgbindir@/@pkgprefix@fluxbox@pkgsuffix@ -log "$HOME/.fluxbox/log"
85EOF 85EOF
86 ) > "$startup" 86 ) > "$startup"
87 fi 87 fi