aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkt <markt>2006-06-23 00:31:08 (GMT)
committermarkt <markt>2006-06-23 00:31:08 (GMT)
commit5fc5ec3374ad903cdf6a2c6b30ce7d8de54d087b (patch)
tree17b83d474590815da1e23f3e8843c6faf8112e98
parentdedbd7e46816ebce6628d9357cc7feee7a61ab57 (diff)
downloadfluxbox-5fc5ec3374ad903cdf6a2c6b30ce7d8de54d087b.zip
fluxbox-5fc5ec3374ad903cdf6a2c6b30ce7d8de54d087b.tar.bz2
Make startfluxbox aware of --program-prefix and --program-suffix
-rw-r--r--ChangeLog3
-rw-r--r--configure.in3
-rw-r--r--util/Makefile.am5
-rwxr-xr-xutil/startfluxbox.in8
4 files changed, 15 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 76f8576..6da5371 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.0rc2: 2Changes for 1.0rc2:
3*06/06/23:
4 * Make startfluxbox aware of --program-prefix and --program-suffix (Mark)
5 configure.in util/Makefile.am util/startfluxbox.in
3*06/06/22: 6*06/06/22:
4 * new Resource: session.modKey: <modkey> (thanks Jim Ramsay i dot am at jimramsay dot com) 7 * new Resource: session.modKey: <modkey> (thanks Jim Ramsay i dot am at jimramsay dot com)
5 new Command: SetModKey <modkey> 8 new Command: SetModKey <modkey>
diff --git a/configure.in b/configure.in
index 54e8a12..7b32edc 100644
--- a/configure.in
+++ b/configure.in
@@ -592,6 +592,9 @@ AC_ARG_WITH(
592AC_DEFINE_UNQUOTED(LOCALEPATH, "$LOCALE_PATH", "location for nls files") 592AC_DEFINE_UNQUOTED(LOCALEPATH, "$LOCALE_PATH", "location for nls files")
593AC_SUBST(LOCALE_PATH) 593AC_SUBST(LOCALE_PATH)
594 594
595AC_SUBST(program_prefix)
596AC_SUBST(program_suffix)
597
595dnl Determine the return type of signal handlers 598dnl Determine the return type of signal handlers
596AC_TYPE_SIGNAL 599AC_TYPE_SIGNAL
597 600
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