From 5140c099b3985877d37b2cdcfc4d7711c40c6aeb Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Wed, 31 Jul 2013 22:57:11 -0500
Subject: remove --enable-localinstall

---
 configure.ac               | 27 -----------------
 data/Makefile.am           |  2 +-
 po/indicator-bluetooth.pot | 72 ----------------------------------------------
 src/Makefile.am            |  2 +-
 4 files changed, 2 insertions(+), 101 deletions(-)
 delete mode 100644 po/indicator-bluetooth.pot

diff --git a/configure.ac b/configure.ac
index b411913..c460511 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,33 +35,6 @@ dnl ###########################################################################
 IT_PROG_INTLTOOL([0.35.0])
 AC_SUBST(GETTEXT_PACKAGE, indicator-bluetooth)
 
-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)
-
-dnl ###########################################################################
-dnl Indicator Info
-dnl ###########################################################################
-
-AS_IF([test "x$with_localinstall" = "xyes"],
-	[
-	INDICATORDIR="${libdir}/indicators3/7/"
-	],
-	[
-	INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3-0.4`
-	])
-AC_SUBST(INDICATORDIR)
-
-dnl ###########################################################################
-dnl DBus Service Info
-dnl ###########################################################################
-
-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)
-
 dnl ###########################################################################
 dnl Files to generate
 dnl ###########################################################################
diff --git a/data/Makefile.am b/data/Makefile.am
index 6f16e85..6c491f1 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,4 +1,4 @@
-dbus_servicesdir = $(DBUSSERVICEDIR)
+dbus_servicesdir = $(datadir)/dbus-1/services
 dbus_services_DATA = indicator-bluetooth.service
 
 %.service: %.service.in
diff --git a/po/indicator-bluetooth.pot b/po/indicator-bluetooth.pot
deleted file mode 100644
index 9559462..0000000
--- a/po/indicator-bluetooth.pot
+++ /dev/null
@@ -1,72 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-08 11:56+1300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ../data/com.canonical.indicator.bluetooth.gschema.xml.in.h:1
-msgid "Whether or not to show the bluetooth indicator in the menu bar."
-msgstr ""
-
-#: ../src/indicator-bluetooth.vala:17
-#: ../src/indicator-bluetooth-service.vala:231
-msgid "Bluetooth: On"
-msgstr ""
-
-#: ../src/indicator-bluetooth-service.vala:54
-#: ../src/indicator-bluetooth-service.vala:438
-msgid "Bluetooth"
-msgstr ""
-
-#: ../src/indicator-bluetooth-service.vala:68
-msgid "Visible"
-msgstr ""
-
-#: ../src/indicator-bluetooth-service.vala:117
-msgid "Set Up New Device…"
-msgstr ""
-
-#: ../src/indicator-bluetooth-service.vala:122
-msgid "Bluetooth Settings…"
-msgstr ""
-
-#: ../src/indicator-bluetooth-service.vala:231
-msgid "Bluetooth: Off"
-msgstr ""
-
-#: ../src/indicator-bluetooth-service.vala:290
-msgid "Connection"
-msgstr ""
-
-#: ../src/indicator-bluetooth-service.vala:313
-msgid "Send files…"
-msgstr ""
-
-#: ../src/indicator-bluetooth-service.vala:321
-msgid "Browse files…"
-msgstr ""
-
-#: ../src/indicator-bluetooth-service.vala:330
-msgid "Keyboard Settings…"
-msgstr ""
-
-#: ../src/indicator-bluetooth-service.vala:338
-msgid "Mouse and Touchpad Settings…"
-msgstr ""
-
-#: ../src/indicator-bluetooth-service.vala:347
-msgid "Sound Settings…"
-msgstr ""
diff --git a/src/Makefile.am b/src/Makefile.am
index 6bbb623..8f8d7eb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,5 @@
 pkglibexec_PROGRAMS = indicator-bluetooth-service
-indicatordir = $(INDICATORDIR)
+indicatordir = ${libdir}/indicators3/7
 indicator_LTLIBRARIES = libbluetooth.la
 
 indicator_bluetooth_service_SOURCES = 	\
-- 
cgit v1.2.3