From 32072123431cbec91d131404828bb74b2b504212 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Thu, 26 Oct 2017 19:12:37 +0200
Subject: {configure.ac,Makefile.am}: Drop distcheck features.

---
 Makefile.am  | 28 ----------------------------
 configure.ac | 12 +-----------
 2 files changed, 1 insertion(+), 39 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 4c4f5b3..8ddabd4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,32 +5,4 @@ SUBDIRS = data		\
 EXTRA_DIST = \
 	ChangeLog
 
-DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall
-
-dist-hook:
-	@if test -d "$(top_srcdir)/.git"; \
-	    then \
-	        echo Creating ChangeLog && \
-	        ( cd "$(top_srcdir)" && \
-	        echo '# Generated by Makefile. Do not edit.'; echo; \
-	        $(top_srcdir)/missing --run git --no-pager log --since "1970" --format="%ai %aN (%h) %n%n%x09*%w(68,0,10) %s%d%n") > ChangeLog.tmp \
-	        && mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \
-	        || (rm -f ChangeLog.tmp; \
-	            echo Failed to generate ChangeLog >&2 ); \
-	else \
-	    echo Failed to generate ChangeLog: not a branch >&2; \
-	fi
-	@if test -d "$(top_srcdir)/.git"; \
-	    then \
-	        echo Creating AUTHORS && \
-	            ( cd "$(top_srcdir)" && \
-	            echo '# Generated by Makefile. Do not edit.'; echo; \
-	            $(top_srcdir)/missing --run  git log | grep -e "^Author:" -e "Committer:" | cut -d ":" -f 2 | cut -d "<" -f 1 | sort -u) > AUTHORS.tmp \
-	            && mv -f AUTHORS.tmp $(top_distdir)/AUTHORS \
-	            || (rm -f AUTHORS.tmp; \
-	                echo Failed to generate AUTHORS >&2 ); \
-	    else \
-	        echo Failed to generate AUTHORS: not a branch >&2; \
-	fi
-
 include $(top_srcdir)/Makefile.am.coverage
diff --git a/configure.ac b/configure.ac
index ac4b7c4..3e992a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -79,21 +79,11 @@ AC_SUBST(INDICATOR_LIBS)
 AC_SUBST(APPINDICATOR_CFLAGS)
 AC_SUBST(APPINDICATOR_LIBS)
 
-###########################
-# 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)
-
 ###########################
 # Indicator Info
 ###########################
 
-if test "x$with_localinstall" = "xyes"; then
-	INDICATORDIR="${libdir}/ayatana-indicators/2/"
-	INDICATORICONSDIR="${datadir}/libayatana-indicate/icons/"
-elif test "x$with_gtk" = x2; then
+if test "x$with_gtk" = x2; then
 	INDICATORDIR=`$PKG_CONFIG --variable=indicatordir ayatana-indicator-0.4`
 	INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir ayatana-indicator-0.4`
 else
-- 
cgit v1.2.3