Revert part of 3.14.1-128-g498b61c, fixing Coverity CID #1398594.

[claws.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index edf69ab132da2314da3dc4fd6d1a892210f2fed0..3fdb4aabf4250332b5abc8c37029ad7a8e98517c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,18 +7,6 @@ ACLOCAL_AMFLAGS = -I m4
 AUTOMAKE_OPTIONS = dist-bzip2 dist-xz
 
 SUBDIRS = m4 po src tools config doc manual
-if BUILD_APPDATA
-SUBDIRS += appdata
-endif
-DIST_SUBDIRS = appdata $(SUBDIRS)
-
-# when changing the name or location of the .desktop file,
-# also update src/common/Makefile.am
-desktop_in_files = claws-mail.desktop.in
-desktopdir = $(datadir)/applications
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-
-@INTLTOOL_DESKTOP_RULE@
 
 EXTRA_DIST = \
        ChangeLog \
@@ -30,8 +18,7 @@ EXTRA_DIST = \
        claws-mail-128x128.png \
        claws-mail-64x64.png \
        claws-mail.pc.in \
-       $(desktop_DATA) \
-       $(desktop_in_files) \
+       claws-mail.desktop \
        claws-mail.png \
        autogen.sh \
        claws-features.h.in \
@@ -47,6 +34,11 @@ pixmap64_DATA=claws-mail-64x64.png
 pixmap128dir=$(datadir)/icons/hicolor/128x128/apps
 pixmap128_DATA=claws-mail-128x128.png
 
+# when changing the name or location of the .desktop file,
+# also update src/common/Makefile.am
+gnomapdir = $(datadir)/applications
+gnomap_DATA=claws-mail.desktop
+
 rename-icons:
        @cd $(DESTDIR)$(datadir)/icons/hicolor/64x64/apps && \
             mv claws-mail-64x64.png claws-mail.png