From 52ae9fab6eb36f5faa4e162b08b099d7bd27f56f Mon Sep 17 00:00:00 2001 From: Kjartan Maraas Date: Thu, 16 Nov 2006 13:17:12 +0000 Subject: [PATCH] Fix mis-handling of libexecdir. Based on suggestions from dmacks at 2006-11-16 Kjartan Maraas * configure.in: * src/Makefile.am: Fix mis-handling of libexecdir. Based on suggestions from dmacks at netspace org and Christian Persch. Closes bug #344029. --- ChangeLog | 8 ++++++++ configure.in | 9 --------- src/Makefile.am | 1 + 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4e0d5e02..12d28f9b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2006-11-16 Kjartan Maraas + * configure.in: + * src/Makefile.am: + Fix mis-handling of libexecdir. Based on suggestions from + dmacks at netspace org and Christian Persch. Closes + bug #344029. + +2006-11-16 Kjartan Maraas + * src/bug-buddy.desktop.in.in: Add GTK to the category. Patch from Stephane LOEUILLET. Closes bug 328026. diff --git a/configure.in b/configure.in index 43e266ee..fc0a4f0a 100644 --- a/configure.in +++ b/configure.in @@ -95,15 +95,6 @@ AC_ARG_ENABLE(deprecations,AC_HELP_STRING([--enable-deprecations],[warn about de AM_CONDITIONAL(ENABLE_DEPRECATIONS, test "x$enable_deprecations" = xyes) -if test "x$prefix" = "xNONE"; then - GNOMELIBEXECDIR=$ac_default_prefix/libexec -else - GNOMELIBEXECDIR=$prefix/libexec -fi -AC_DEFINE_UNQUOTED(GNOMELIBEXECDIR, "$GNOMELIBEXECDIR", [Libexec directory]) - - - AC_OUTPUT([ bug-buddy.spec bug-buddy.schemas diff --git a/src/Makefile.am b/src/Makefile.am index 0aa8072b..57f6f187 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -16,6 +16,7 @@ endif INCLUDES = \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ + -DGNOMELIBEXECDIR=\""$(libexecdir)"\" \ $(BUG_BUDDY_CFLAGS) -I$(includedir) \ $(LIBNM_CFLAGS) \ -DBUDDY_DATADIR=\""$(buddydir)"\" \ -- 2.11.4.GIT