aboutsummaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authormarkt <markt>2007-07-07 23:11:04 (GMT)
committermarkt <markt>2007-07-07 23:11:04 (GMT)
commit135019abf97c7adb236c061d46e3906e51c8a145 (patch)
tree2e675ac4d9dfda48301e0b2a40b057448174692e /data
parentb735d405f58ac226e025d6ef4dbd91a0129bb12e (diff)
downloadfluxbox_pavel-135019abf97c7adb236c061d46e3906e51c8a145.zip
fluxbox_pavel-135019abf97c7adb236c061d46e3906e51c8a145.tar.bz2
fixes for --program-prefix and --program-suffix, plus fixed overwriting init file on reconfigure
Diffstat (limited to 'data')
-rw-r--r--data/Makefile.am5
-rw-r--r--data/init.in6
2 files changed, 7 insertions, 4 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index 0402551..852667f 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,5 +1,8 @@
1# data/Makefile.am for Fluxbox - an X11 Window manager 1# data/Makefile.am for Fluxbox - an X11 Window manager
2 2
3PROGRAM_PREFIX=@program_prefix@
4PROGRAM_SUFFIX=@program_suffix@
5
3DEFAULT_MENU = @DEFAULT_MENU@ 6DEFAULT_MENU = @DEFAULT_MENU@
4DEFAULT_STYLE = @DEFAULT_STYLE@ 7DEFAULT_STYLE = @DEFAULT_STYLE@
5DEFAULT_KEYS = @DEFAULT_KEYS@ 8DEFAULT_KEYS = @DEFAULT_KEYS@
@@ -26,6 +29,8 @@ distclean-local:
26 rm -f *\~ 29 rm -f *\~
27init: init.in 30init: init.in
28 @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir),g" \ 31 @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir),g" \
32 -e "s,@pkgprefix@,$(PROGRAM_PREFIX:NONE=),g" \
33 -e "s,@pkgsuffix@,$(PROGRAM_SUFFIX:NONE=),g" \
29 -e "s,@default_style@,$(DEFAULT_STYLE),g" $(srcdir)/init.in > init 34 -e "s,@default_style@,$(DEFAULT_STYLE),g" $(srcdir)/init.in > init
30 35
31menu: ../util/fluxbox-generate_menu 36menu: ../util/fluxbox-generate_menu
diff --git a/data/init.in b/data/init.in
index 76b4e08..43ab4ae 100644
--- a/data/init.in
+++ b/data/init.in
@@ -3,8 +3,6 @@ session.screen0.slit.direction: Vertical
3session.screen0.slit.onTop: False 3session.screen0.slit.onTop: False
4session.screen0.slit.autoHide: False 4session.screen0.slit.autoHide: False
5session.screen0.tab.placement: Top 5session.screen0.tab.placement: Top
6session.screen0.tab.alignment: Left
7session.screen0.tab.rotatevertical: True
8session.screen0.toolbar.onTop: False 6session.screen0.toolbar.onTop: False
9session.screen0.toolbar.autoHide: False 7session.screen0.toolbar.autoHide: False
10session.screen0.toolbar.placement: BottomCenter 8session.screen0.toolbar.placement: BottomCenter
@@ -25,10 +23,10 @@ session.screen0.tab.height: 16
25session.screen0.showwindowposition: true 23session.screen0.showwindowposition: true
26session.opaqueMove: False 24session.opaqueMove: False
27session.autoRaiseDelay: 250 25session.autoRaiseDelay: 250
28session.menuFile: ~/.fluxbox/menu 26session.menuFile: ~/.@pkgprefix@fluxbox@pkgsuffix@/menu
29session.cacheLife: 5 27session.cacheLife: 5
30session.styleFile: @default_style@ 28session.styleFile: @default_style@
31session.keyFile: ~/.fluxbox/keys 29session.keyFile: ~/.@pkgprefix@fluxbox@pkgsuffix@/keys
32session.colorsPerChannel: 4 30session.colorsPerChannel: 4
33session.doubleClickInterval: 250 31session.doubleClickInterval: 250
34session.cacheMax: 200 32session.cacheMax: 200