[notification-daemon] remove acinclude.m4

[Alberts Muktupāvels <muktupavels src gnome org>]

commit 193ef4e57da53b11f398dd16f04a7eb967e4c46e
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Wed Sep 16 03:02:21 2015 +0300

    remove acinclude.m4

 acinclude.m4                                     |   40 ----------------------
 configure.ac                                     |    2 -
 data/Makefile.am                                 |    9 +++--
 data/notification-daemon-autostart.desktop.in.in |    2 +-
 data/notification-daemon.desktop.in.in           |    2 +-
 5 files changed, 7 insertions(+), 48 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 2592cbf..d889148 100644
--- a/configure.ac
+++ b/configure.ac
@@ -64,8 +64,6 @@ PKG_CHECK_MODULES(NOTIFICATION_DAEMON, $pkg_modules)
 AC_SUBST(NOTIFICATION_DAEMON_CFLAGS)
 AC_SUBST(NOTIFICATION_DAEMON_LIBS)
 
-AS_AC_EXPAND(LIBEXECDIR, $libexecdir)
-
 AC_CONFIG_FILES([
 Makefile
 data/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 7cd4d08..a148225 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -8,6 +8,9 @@ desktop_in_in_files = notification-daemon.desktop.in.in
 desktop_in_files    = notification-daemon.desktop.in
 desktop_DATA        = $(desktop_in_files:.desktop.in=.desktop)
 
+%.desktop.in: %.desktop.in.in
+       $(AM_V_GEN) sed -e 's,[ ]libexecdir[@],$(libexecdir),g' < $< > $@
+
 %.desktop: %.desktop.in
        $(AM_V_GEN) $(MSGFMT) --desktop --template $< -o $ -t \
                -d $(top_srcdir)/po && mv $ -t $@
@@ -17,11 +20,9 @@ EXTRA_DIST = \
        $(desktop_in_in_files)
 
 CLEANFILES = \
+       $(autostart_in_files) \
        $(autostart_DATA) \
+       $(desktop_in_files) \
        $(desktop_DATA)
 
-DISTCLEANFILES = \
-       $(autostart_in_files) \
-       $(desktop_in_files)
-
 -include $(top_srcdir)/git.mk
diff --git a/data/notification-daemon-autostart.desktop.in.in 
b/data/notification-daemon-autostart.desktop.in.in
index 1c3e152..111c420 100644
--- a/data/notification-daemon-autostart.desktop.in.in
+++ b/data/notification-daemon-autostart.desktop.in.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=Notification Daemon
 Comment=Display notifications
-Exec= LIBEXECDIR@/notification-daemon
+Exec= libexecdir@/notification-daemon
 Terminal=false
 Type=Application
 OnlyShowIn=GNOME-Flashback;
diff --git a/data/notification-daemon.desktop.in.in b/data/notification-daemon.desktop.in.in
index c067f18..601a6af 100644
--- a/data/notification-daemon.desktop.in.in
+++ b/data/notification-daemon.desktop.in.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=Notification Daemon
 Comment=Display notifications
-Exec= LIBEXECDIR@/notification-daemon
+Exec= libexecdir@/notification-daemon
 Terminal=false
 Type=Application
 NoDisplay=true