From 7281da8b2c37b58d69378cc852a2aa5173c82f47 Mon Sep 17 00:00:00 2001 From: Patrick Griffis Date: Sat, 27 Aug 2016 22:42:36 -0400 Subject: build: Avoid installing uncessary files with features disabled --- data/Makefile.am | 12 ++++++++++-- data/misc/Makefile.am | 16 +++++++++++++--- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/data/Makefile.am b/data/Makefile.am index 7b124b87..b5077d24 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,7 +1,15 @@ -SUBDIRS = pkgconfig man +SUBDIRS = + +if DO_PLUGIN +SUBDIRS += pkgconfig +endif if DO_GTK -SUBDIRS += icons misc +SUBDIRS += icons misc man +else +if WITH_TM +SUBDIRS += misc +endif endif EXTRA_DIST = \ diff --git a/data/misc/Makefile.am b/data/misc/Makefile.am index e40c4ba9..45036a3c 100644 --- a/data/misc/Makefile.am +++ b/data/misc/Makefile.am @@ -1,6 +1,12 @@ -appdata_in_files = hexchat.appdata.xml.in -appdata_DATA = $(appdata_in_files:.xml.in=.xml) + appdatadir = $(datadir)/appdata +appdata_in_files = + +if DO_GTK +appdata_in_files += hexchat.appdata.xml.in +endif + +appdata_DATA = $(appdata_in_files:.xml.in=.xml) @INTLTOOL_XML_RULE@ if USE_DBUS @@ -13,7 +19,11 @@ hexchat.desktop.in: hexchat.desktop.in.in $(AM_V_GEN)sed -e s!\@exec_command\@!$(exec_command)! < $< > $@ data_desktopdir = $(datadir)/applications -data_desktop_in_files = hexchat.desktop.in +data_desktop_in_files = + +if DO_GTK +data_desktop_in_files += hexchat.desktop.in +endif if WITH_TM data_desktop_in_files += htm.desktop.in -- cgit 1.4.1