From 5d05c0be5587abd3dadea2b2c823a2f250377a0d Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Fri, 28 Jun 2013 16:41:31 -0500
Subject: remove --enable-localinstall options

---
 Makefile.am      |  2 --
 configure.ac     | 34 ----------------------------------
 data/Makefile.am |  2 +-
 src/Makefile.am  |  2 +-
 4 files changed, 2 insertions(+), 38 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index c8b7f9a..133a0da 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,8 +8,6 @@ SUBDIRS += tests
 tests: src
 endif
 
-DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall
-
 EXTRA_DIST = autogen.sh
 
 dist-hook:
diff --git a/configure.ac b/configure.ac
index 8933d17..5c131aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -109,40 +109,6 @@ AM_CONDITIONAL([HAVE_GCOVR], [test "x$ac_cv_check_gcovr" = xyes])
 AC_SUBST(COVERAGE_CFLAGS)
 AC_SUBST(COVERAGE_LDFLAGS)
 
-###########################
-# Check to see if we're local
-###########################
-
-with_localinstall="no"
-AC_ARG_ENABLE(localinstall, AS_HELP_STRING([--enable-localinstall], [install all of the files localy instead of system directories (for distcheck)]), with_localinstall=$enableval, with_localinstall=no)
-
-###########################
-# Control Center Info
-###########################
-
-AS_IF([test "x$have_ccpanel" = "xyes"],
-	[
-	AS_IF([test "x$with_localinstall" = "xyes"],
-		[
-		CCPANELDIR="${libdir}/control-center-1/panels/"
-		],
-		[
-		CCPANELDIR=`$PKG_CONFIG --variable=extensiondir libgnome-control-center`
-		])
-
-	AC_SUBST(CCPANELDIR)
-	])
-###########################
-# DBus Service Info
-###########################
-
-if test "x$with_localinstall" = "xyes"; then
-	DBUSSERVICEDIR="${datadir}/dbus-1/services/"
-else
-	DBUSSERVICEDIR=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1`
-fi
-AC_SUBST(DBUSSERVICEDIR)
-
 ###########################
 # Google Test framework
 ###########################
diff --git a/data/Makefile.am b/data/Makefile.am
index 1a33447..9bcac72 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -21,7 +21,7 @@ EXTRA_DIST += $(gsettings_SCHEMAS)
 # the dbus service file
 #
 
-dbus_servicesdir = $(DBUSSERVICEDIR)
+dbus_servicesdir = $(datadir)/dbus-1/services
 dbus_services_DATA = indicator-datetime.service
 dbus_services_in = $(dbus_services_DATA:.service=.service.in)
 $(dbus_services_DATA): $(dbus_services_in)
diff --git a/src/Makefile.am b/src/Makefile.am
index 7143c6b..2f247c1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
 
 if BUILD_CCPANEL
-ccpaneldir = $(CCPANELDIR)
+ccpaneldir = $(libdir)/control-center-1/panels/
 ccpanel_LTLIBRARIES = libindicator-datetime.la
 endif
 
-- 
cgit v1.2.3