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

make sure that PREFIX is expanded in the correct place (make stage, rather than configure stage). Affects menu, init, keys, locale and style files

Browse source
This commit is contained in:
simonb 2006-07-03 08:37:16 +00:00
parent 3213701f6c
commit 864ba10163
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,4 +1,10 @@
(Format: Year/Month/Day) (Format: Year/Month/Day)
Changes for 1.0rc3:
*06/07/03:
* make our default locale, init, menu, and style paths properly
expand PREFIX in the make install stage, so that make prefix=elsewhere
works properly (Simon)
configure.in
Changes for 1.0rc2: Changes for 1.0rc2:
*06/07/03: *06/07/03:
* call waitpid() on SIGCHLD until no more children (thanks Devin/dlab) * call waitpid() on SIGCHLD until no more children (thanks Devin/dlab)

10
configure.in
View file

@ -555,7 +555,7 @@ AC_ARG_WITH(
menu, menu,
[ --with-menu=path location menu file (PREFIX/share/fluxbox/menu)], [ --with-menu=path location menu file (PREFIX/share/fluxbox/menu)],
DEFAULT_MENU=$with_menu, DEFAULT_MENU=$with_menu,
DEFAULT_MENU=$prefix/share/fluxbox/menu DEFAULT_MENU=\$\(prefix\)/share/fluxbox/menu
) )
AC_SUBST(DEFAULT_MENU) AC_SUBST(DEFAULT_MENU)
@ -563,7 +563,7 @@ AC_ARG_WITH(
style, style,
[ --with-style=path style by default (PREFIX/share/fluxbox/styles/Meta)], [ --with-style=path style by default (PREFIX/share/fluxbox/styles/Meta)],
DEFAULT_STYLE=$with_style, DEFAULT_STYLE=$with_style,
DEFAULT_STYLE=$prefix/share/fluxbox/styles/Meta DEFAULT_STYLE=\$\(prefix\)/share/fluxbox/styles/Meta
) )
AC_SUBST(DEFAULT_STYLE) AC_SUBST(DEFAULT_STYLE)
@ -571,7 +571,7 @@ AC_ARG_WITH(
keys, keys,
[ --with-keys=path location keys file (PREFIX/share/fluxbox/keys)], [ --with-keys=path location keys file (PREFIX/share/fluxbox/keys)],
DEFAULT_KEYS=$with_keys, DEFAULT_KEYS=$with_keys,
DEFAULT_KEYS=$prefix/share/fluxbox/keys DEFAULT_KEYS=\$\(prefix\)/share/fluxbox/keys
) )
AC_SUBST(DEFAULT_KEYS) AC_SUBST(DEFAULT_KEYS)
@ -579,7 +579,7 @@ AC_ARG_WITH(
init, init,
[ --with-init=path location init file (PREFIX/share/fluxbox/init)], [ --with-init=path location init file (PREFIX/share/fluxbox/init)],
DEFAULT_INIT=$with_init, DEFAULT_INIT=$with_init,
DEFAULT_INIT=$prefix/share/fluxbox/init DEFAULT_INIT=\$\(prefix\)/share/fluxbox/init
) )
AC_SUBST(DEFAULT_INIT) AC_SUBST(DEFAULT_INIT)
@ -587,7 +587,7 @@ AC_ARG_WITH(
locale, locale,
[ --with-locale=path location for nls files (PREFIX/share/fluxbox/nls)], [ --with-locale=path location for nls files (PREFIX/share/fluxbox/nls)],
LOCALE_PATH=$with_locale_path, LOCALE_PATH=$with_locale_path,
LOCALE_PATH=$prefix/share/fluxbox/nls LOCALE_PATH=\$\(prefix\)/share/fluxbox/nls
) )
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)