From 0c9ba43b5dc39c07565c220a2d6eb62c2ca4ede2 Mon Sep 17 00:00:00 2001 From: Bradford Hovinen Date: Wed, 12 Sep 2001 15:37:49 +0000 Subject: [PATCH] Added rollback 2001-09-07 Bradford Hovinen * capplets/Makefile.am (always_built_SUBDIRS): Added rollback 2001-09-04 Bradford Hovinen * configure.in: Use ${real_prefix}/share rather than ${datadir}, etc. * acconfig.h: Add GNOMECC_DEFAULTS_DIR * configure.in (GNOMECC_DEFAULTS_DIR): Define this here --- ChangeLog | 13 +++++++++++++ configure.in | 11 +++++++---- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8f629dea7..33db2dfd6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,19 @@ * configure.in(ALL_LINGUAS): Removed zh_CN.GB2312. +2001-09-07 Bradford Hovinen + + * capplets/Makefile.am (always_built_SUBDIRS): Added rollback + +2001-09-04 Bradford Hovinen + + * configure.in: Use ${real_prefix}/share rather than ${datadir}, + etc. + + * acconfig.h: Add GNOMECC_DEFAULTS_DIR + + * configure.in (GNOMECC_DEFAULTS_DIR): Define this here + 2001-08-29 Bradford Hovinen * RELEASE : 1.5.7 diff --git a/configure.in b/configure.in index 4bdbbb6fd..6172f2993 100644 --- a/configure.in +++ b/configure.in @@ -200,16 +200,19 @@ else fi AC_DEFINE_UNQUOTED(GNOMECC_ICONS_DIR, "${real_prefix}/share/${PACKAGE}/icons") -GNOMECC_ICONS_DIR=""${datadir}/${PACKAGE}/icons"" +GNOMECC_ICONS_DIR=""${real_prefix}/share/${PACKAGE}/icons"" AC_SUBST(GNOMECC_ICONS_DIR) AC_DEFINE_UNQUOTED(GNOMECC_GLADE_DIR, "${real_prefix}/share/${PACKAGE}/interfaces") -GNOMECC_GLADE_DIR=""${datadir}/${PACKAGE}/interfaces"" +GNOMECC_GLADE_DIR=""${real_prefix}/share/${PACKAGE}/interfaces"" AC_SUBST(GNOMECC_GLADE_DIR) AC_DEFINE_UNQUOTED(GNOMECC_PIXMAPS_DIR, "${real_prefix}/share/${PACKAGE}/pixmaps") -GNOMECC_PIXMAPS_DIR=""${datadir}/${PACKAGE}/pixmaps"" +GNOMECC_PIXMAPS_DIR=""${real_prefix}/share/${PACKAGE}/pixmaps"" AC_SUBST(GNOMECC_PIXMAPS_DIR) +AC_DEFINE_UNQUOTED(GNOMECC_DEFAULTS_DIR, "${real_prefix}/share/${PACKAGE}/defaults") +GNOMECC_DEFAULTS_DIR=""${real_prefix}/share/${PACKAGE}/defaults"" +AC_SUBST(GNOMECC_DEFAULTS_DIR) AC_DEFINE_UNQUOTED(GNOMECC_SCREENSAVERS_DIR, "${real_prefix}/share/${PACKAGE}/screensavers") -GNOMECC_SCREENSAVERS_DIR=""${datadir}/${PACKAGE}/screensavers"" +GNOMECC_SCREENSAVERS_DIR=""${real_prefix}/share/${PACKAGE}/screensavers"" AC_SUBST(GNOMECC_SCREENSAVERS_DIR) dnl ============================================== dnl End: Define the directories