nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make startfluxbox aware of --program-prefix and --program-suffix

Browse source
This commit is contained in:
markt 2006-06-23 00:31:08 +00:00
parent dedbd7e468
commit 5fc5ec3374
4 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,5 +1,8 @@
(Format: Year/Month/Day) (Format: Year/Month/Day)
Changes for 1.0rc2: Changes for 1.0rc2:
*06/06/23:
* Make startfluxbox aware of --program-prefix and --program-suffix (Mark)
configure.in util/Makefile.am util/startfluxbox.in
*06/06/22: *06/06/22:
* new Resource: session.modKey: <modkey> (thanks Jim Ramsay i dot am at jimramsay dot com) * new Resource: session.modKey: <modkey> (thanks Jim Ramsay i dot am at jimramsay dot com)
new Command: SetModKey <modkey> new Command: SetModKey <modkey>

3
configure.in
View file

@ -592,6 +592,9 @@ AC_ARG_WITH(
AC_DEFINE_UNQUOTED(LOCALEPATH, "$LOCALE_PATH", "location for nls files") AC_DEFINE_UNQUOTED(LOCALEPATH, "$LOCALE_PATH", "location for nls files")
AC_SUBST(LOCALE_PATH) AC_SUBST(LOCALE_PATH)
AC_SUBST(program_prefix)
AC_SUBST(program_suffix)
dnl Determine the return type of signal handlers dnl Determine the return type of signal handlers
AC_TYPE_SIGNAL AC_TYPE_SIGNAL

5
util/Makefile.am
View file

@ -11,6 +11,9 @@ MAINTAINERCLEANFILES= Makefile.in
EXTRA_DIST= fbsetbg fluxbox-generate_menu.in \ EXTRA_DIST= fbsetbg fluxbox-generate_menu.in \
startfluxbox.in startfluxbox.in
PROGRAM_PREFIX=@program_prefix@
PROGRAM_SUFFIX=@program_suffix@
all-local: startfluxbox all-local: startfluxbox
clean-local: clean-local:
@ -22,6 +25,8 @@ fbsetroot.o: fbsetroot.cc ../config.h $(srcdir)/fbsetroot.hh \
startfluxbox: startfluxbox.in startfluxbox: startfluxbox.in
@regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir),g" \ @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir),g" \
-e "s,@pkgbindir@,$(bindir),g" \ -e "s,@pkgbindir@,$(bindir),g" \
-e "s,@pkgprefix@,$(PROGRAM_PREFIX:NONE=),g" \
-e "s,@pkgsuffix@,$(PROGRAM_SUFFIX:NONE=),g" \
$(srcdir)/startfluxbox.in > startfluxbox $(srcdir)/startfluxbox.in > startfluxbox
-chmod 755 startfluxbox -chmod 755 startfluxbox

8
util/startfluxbox.in
View file

@ -44,10 +44,10 @@ else
# #
# This sets a black background # This sets a black background
@pkgbindir@/fbsetroot -solid black @pkgbindir@/@pkgprefix@fbsetroot@pkgsuffix@ -solid black
# This shows the fluxbox-splash-screen # This shows the fluxbox-splash-screen
# fbsetbg -C @pkgdatadir@/splash.jpg # @pkgprefix@fbsetbg@pkgsuffix@ -C @pkgdatadir@/splash.jpg
# Other examples. Check man xset for details. # Other examples. Check man xset for details.
# #
@ -79,9 +79,9 @@ else
# And last but not least we start fluxbox. # And last but not least we start fluxbox.
# Because it is the last app you have to run it with ''exec'' before it. # Because it is the last app you have to run it with ''exec'' before it.
exec @pkgbindir@/fluxbox exec @pkgbindir@/@pkgprefix@fluxbox@pkgsuffix@
# or if you want to keep a log: # or if you want to keep a log:
# exec @pkgbindir@/fluxbox -log "$HOME/.fluxbox/log" # exec @pkgbindir@/@pkgprefix@fluxbox@pkgsuffix@ -log "$HOME/.fluxbox/log"
EOF EOF
) > "$startup" ) > "$startup"
fi fi