aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsimonb <simonb>2006-07-03 08:37:16 (GMT)
committersimonb <simonb>2006-07-03 08:37:16 (GMT)
commit864ba10163084f4c98b5e3ea7faa7511f4b9c274 (patch)
treea2bec14f5a6e503790e8d4ed31fdfd299aa3fcb0
parent3213701f6c3c52dcdb592e8f9cd6e6d5dbd39dd7 (diff)
downloadfluxbox_paul-864ba10163084f4c98b5e3ea7faa7511f4b9c274.zip
fluxbox_paul-864ba10163084f4c98b5e3ea7faa7511f4b9c274.tar.bz2
make sure that PREFIX is expanded in the correct place (make stage, rather than configure stage). Affects menu, init, keys, locale and style files
-rw-r--r--ChangeLog6
-rw-r--r--configure.in10
2 files changed, 11 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 03c7df2..6ddfd30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.0rc3:
3*06/07/03:
4 * make our default locale, init, menu, and style paths properly
5 expand PREFIX in the make install stage, so that make prefix=elsewhere
6 works properly (Simon)
7 configure.in
2Changes for 1.0rc2: 8Changes for 1.0rc2:
3*06/07/03: 9*06/07/03:
4 * call waitpid() on SIGCHLD until no more children (thanks Devin/dlab) 10 * call waitpid() on SIGCHLD until no more children (thanks Devin/dlab)
diff --git a/configure.in b/configure.in
index 49563b5..f86455e 100644
--- a/configure.in
+++ b/configure.in
@@ -555,7 +555,7 @@ AC_ARG_WITH(
555 menu, 555 menu,
556 [ --with-menu=path location menu file (PREFIX/share/fluxbox/menu)], 556 [ --with-menu=path location menu file (PREFIX/share/fluxbox/menu)],
557 DEFAULT_MENU=$with_menu, 557 DEFAULT_MENU=$with_menu,
558 DEFAULT_MENU=$prefix/share/fluxbox/menu 558 DEFAULT_MENU=\$\(prefix\)/share/fluxbox/menu
559) 559)
560AC_SUBST(DEFAULT_MENU) 560AC_SUBST(DEFAULT_MENU)
561 561
@@ -563,7 +563,7 @@ AC_ARG_WITH(
563 style, 563 style,
564 [ --with-style=path style by default (PREFIX/share/fluxbox/styles/Meta)], 564 [ --with-style=path style by default (PREFIX/share/fluxbox/styles/Meta)],
565 DEFAULT_STYLE=$with_style, 565 DEFAULT_STYLE=$with_style,
566 DEFAULT_STYLE=$prefix/share/fluxbox/styles/Meta 566 DEFAULT_STYLE=\$\(prefix\)/share/fluxbox/styles/Meta
567) 567)
568AC_SUBST(DEFAULT_STYLE) 568AC_SUBST(DEFAULT_STYLE)
569 569
@@ -571,7 +571,7 @@ AC_ARG_WITH(
571 keys, 571 keys,
572 [ --with-keys=path location keys file (PREFIX/share/fluxbox/keys)], 572 [ --with-keys=path location keys file (PREFIX/share/fluxbox/keys)],
573 DEFAULT_KEYS=$with_keys, 573 DEFAULT_KEYS=$with_keys,
574 DEFAULT_KEYS=$prefix/share/fluxbox/keys 574 DEFAULT_KEYS=\$\(prefix\)/share/fluxbox/keys
575) 575)
576AC_SUBST(DEFAULT_KEYS) 576AC_SUBST(DEFAULT_KEYS)
577 577
@@ -579,7 +579,7 @@ AC_ARG_WITH(
579 init, 579 init,
580 [ --with-init=path location init file (PREFIX/share/fluxbox/init)], 580 [ --with-init=path location init file (PREFIX/share/fluxbox/init)],
581 DEFAULT_INIT=$with_init, 581 DEFAULT_INIT=$with_init,
582 DEFAULT_INIT=$prefix/share/fluxbox/init 582 DEFAULT_INIT=\$\(prefix\)/share/fluxbox/init
583) 583)
584AC_SUBST(DEFAULT_INIT) 584AC_SUBST(DEFAULT_INIT)
585 585
@@ -587,7 +587,7 @@ AC_ARG_WITH(
587 locale, 587 locale,
588 [ --with-locale=path location for nls files (PREFIX/share/fluxbox/nls)], 588 [ --with-locale=path location for nls files (PREFIX/share/fluxbox/nls)],
589 LOCALE_PATH=$with_locale_path, 589 LOCALE_PATH=$with_locale_path,
590 LOCALE_PATH=$prefix/share/fluxbox/nls 590 LOCALE_PATH=\$\(prefix\)/share/fluxbox/nls
591) 591)
592AC_DEFINE_UNQUOTED(LOCALEPATH, "$LOCALE_PATH", "location for nls files") 592AC_DEFINE_UNQUOTED(LOCALEPATH, "$LOCALE_PATH", "location for nls files")
593AC_SUBST(LOCALE_PATH) 593AC_SUBST(LOCALE_PATH)