some fixes for --program-prefix and --program-suffix, plus fix overwriting init file on reconfigure

2 files changed, 7 insertions, 4 deletions

diff --git a/data/Makefile.am b/data/Makefile.am
index 2a99ce4..18a05cc 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,5 +1,8 @@
 # data/Makefile.am for Fluxbox - an X11 Window manager
 
+PROGRAM_PREFIX=@program_prefix@
+PROGRAM_SUFFIX=@program_suffix@
+
 DEFAULT_MENU = @DEFAULT_MENU@
 DEFAULT_STYLE = @DEFAULT_STYLE@
 DEFAULT_KEYS = @DEFAULT_KEYS@
@@ -26,6 +29,8 @@ distclean-local:
                 rm -f *\~
 init:                   init.in
         @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir),g" \
+                        -e "s,@pkgprefix@,$(PROGRAM_PREFIX:NONE=),g" \
+                        -e "s,@pkgsuffix@,$(PROGRAM_SUFFIX:NONE=),g" \
                         -e "s,@default_style@,$(DEFAULT_STYLE),g" $(srcdir)/init.in > init
 
 menu:                   ../util/fluxbox-generate_menu
diff --git a/data/init.in b/data/init.in
index 2dfbc5b..5ad9aa3 100644
--- a/data/init.in
+++ b/data/init.in
@@ -3,8 +3,6 @@ session.screen0.slit.direction:	Vertical
 session.screen0.slit.onTop:     False
 session.screen0.slit.autoHide:  False
 session.screen0.tab.placement:  Top
-session.screen0.tab.alignment:  Left
-session.screen0.tab.rotatevertical:     True
 session.screen0.toolbar.onTop:  False
 session.screen0.toolbar.autoHide:       False
 session.screen0.toolbar.placement:      BottomCenter
@@ -25,10 +23,10 @@ session.screen0.tab.height:	16
 session.screen0.showwindowposition: true
 session.opaqueMove:     False
 session.autoRaiseDelay: 250
-session.menuFile:       ~/.fluxbox/menu
+session.menuFile:       ~/.@pkgprefix@fluxbox@pkgsuffix@/menu
 session.cacheLife:      5
 session.styleFile:      @default_style@
-session.keyFile: ~/.fluxbox/keys
+session.keyFile: ~/.@pkgprefix@fluxbox@pkgsuffix@/keys
 session.colorsPerChannel:       4
 session.doubleClickInterval:    250
 session.cacheMax:       200