aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkt <markt>2007-12-13 21:15:57 (GMT)
committermarkt <markt>2007-12-13 21:15:57 (GMT)
commit254fb289f318eaedbfe8e3dff4454afd0f66e868 (patch)
treeed6f74f3209abfdbd70ff961cf74a1a60ed18fba
parentb001ea9f1feb32a878b95a0b78c3fb0240f6df68 (diff)
downloadfluxbox_pavel-254fb289f318eaedbfe8e3dff4454afd0f66e868.zip
fluxbox_pavel-254fb289f318eaedbfe8e3dff4454afd0f66e868.tar.bz2
fix --with-style configure option
-rw-r--r--ChangeLog2
-rw-r--r--configure.in2
-rw-r--r--src/Makefile.am2
3 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 1ac500c..0ed65f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.0.1: 2Changes for 1.0.1:
3*07/12/13: 3*07/12/13:
4 * Fix configure option --with-style (thanks Slava Semushin)
5 configure.in Makefile.am
4 * Close menus only when they lose focus (Mark) 6 * Close menus only when they lose focus (Mark)
5 MenuCreator.cc FbTk/Menu.cc 7 MenuCreator.cc FbTk/Menu.cc
6 * Moved command parsing code all over the place -- expect any patches that 8 * Moved command parsing code all over the place -- expect any patches that
diff --git a/configure.in b/configure.in
index a1d9d49..f8c1137 100644
--- a/configure.in
+++ b/configure.in
@@ -564,7 +564,7 @@ AC_SUBST(DEFAULT_MENU)
564 564
565AC_ARG_WITH( 565AC_ARG_WITH(
566 style, 566 style,
567 [ --with-style=path style by default (PREFIX/share/fluxbox/styles/Meta)], 567 [ --with-style=path style by default (PREFIX/share/fluxbox/styles/bloe)],
568 DEFAULT_STYLE=$with_style, 568 DEFAULT_STYLE=$with_style,
569 DEFAULT_STYLE=\$\(prefix\)/share/fluxbox/styles/bloe 569 DEFAULT_STYLE=\$\(prefix\)/share/fluxbox/styles/bloe
570) 570)
diff --git a/src/Makefile.am b/src/Makefile.am
index e718092..a1468ba 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -25,7 +25,7 @@
25 25
26SUBDIRS= FbTk 26SUBDIRS= FbTk
27DEFAULT_MENU=@DEFAULT_MENU@ 27DEFAULT_MENU=@DEFAULT_MENU@
28DEFAULT_STYLE=$(pkgdatadir)/styles/Clean 28DEFAULT_STYLE=@DEFAULT_STYLE@
29DEFAULT_KEYSFILE=@DEFAULT_KEYS@ 29DEFAULT_KEYSFILE=@DEFAULT_KEYS@
30DEFAULT_INITFILE=@DEFAULT_INIT@ 30DEFAULT_INITFILE=@DEFAULT_INIT@
31PROGRAM_PREFIX=@program_prefix@ 31PROGRAM_PREFIX=@program_prefix@