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

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
 EXTRA_DIST=             fbsetbg fluxbox-generate_menu.in \
                                 startfluxbox.in
 
+PROGRAM_PREFIX=@program_prefix@
+PROGRAM_SUFFIX=@program_suffix@
+
 all-local:      startfluxbox
 
 clean-local:
@@ -22,6 +25,8 @@ fbsetroot.o: 	fbsetroot.cc ../config.h $(srcdir)/fbsetroot.hh \
 startfluxbox:   startfluxbox.in
                 @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir),g" \
                             -e "s,@pkgbindir@,$(bindir),g" \
+                            -e "s,@pkgprefix@,$(PROGRAM_PREFIX:NONE=),g" \
+                            -e "s,@pkgsuffix@,$(PROGRAM_SUFFIX:NONE=),g" \
                                 $(srcdir)/startfluxbox.in > startfluxbox
                 -chmod 755 startfluxbox
 
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
 #
 # This sets a black background
 
-@pkgbindir@/fbsetroot -solid black
+@pkgbindir@/@pkgprefix@fbsetroot@pkgsuffix@ -solid black
 
 # 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.
 #
@@ -79,9 +79,9 @@ else
 # And last but not least we start fluxbox.
 # 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:
-# exec @pkgbindir@/fluxbox -log "$HOME/.fluxbox/log"
+# exec @pkgbindir@/@pkgprefix@fluxbox@pkgsuffix@ -log "$HOME/.fluxbox/log"
 EOF
     ) > "$startup"
     fi