aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac21
-rw-r--r--data/Makefile.am2
3 files changed, 1 insertions, 24 deletions
diff --git a/Makefile.am b/Makefile.am
index 00e108d..fbf05ca 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,8 +12,6 @@ endif
dist_noinst_SCRIPTS = \
autogen.sh
-DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall
-
############################################################
dist-hook:
diff --git a/configure.ac b/configure.ac
index aa1cc12..81b6f9f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -79,26 +79,6 @@ AC_SUBST(COVERAGE_CFLAGS)
AC_SUBST(COVERAGE_CXXFLAGS)
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])
-
-###########################
-# DBus Service Info
-###########################
-
-AS_IF([test "x$with_localinstall" = "xyes"],
- [DBUSSERVICEDIR="${datadir}/dbus-1/services/"],
- [DBUSSERVICEDIR=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1`])
-AC_SUBST(DBUSSERVICEDIR)
-
##############################
# Custom Junk
##############################
@@ -150,7 +130,6 @@ AC_MSG_NOTICE([
Power Indicator Configuration:
Prefix: $prefix
- Local Install: $with_localinstall
Unit Tests: $enable_tests
gcov: $use_gcov
diff --git a/data/Makefile.am b/data/Makefile.am
index c2ce65d..289a1f1 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -13,7 +13,7 @@ dist_indicators_DATA = com.canonical.indicator.power
# the dbus service file
#
-dbus_servicesdir = $(DBUSSERVICEDIR)
+dbus_servicesdir = $(datadir)/dbus-1/services
dbus_services_DATA = indicator-power.service
dbus_services_in = $(dbus_services_DATA:.service=.service.in)
$(dbus_services_DATA): $(dbus_services_in)