From 92c8ba04976f02157949b337f764ff3b04e06ce3 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Fri, 10 Jan 2003 20:43:47 +0000 Subject: [PATCH] don't install .desktop file for properties dialog if we aren't 2003-01-10 Havoc Pennington * src/Makefile.am (desktopfiles_DATA): don't install .desktop file for properties dialog if we aren't building/installing the properties dialog. --- ChangeLog | 6 ++++++ src/Makefile.am | 7 +++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2f7d1f0da..908af36ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2003-01-10 Havoc Pennington + + * src/Makefile.am (desktopfiles_DATA): don't install .desktop file + for properties dialog if we aren't building/installing the + properties dialog. + 2003-01-10 Havoc Pennington * NEWS: update diff --git a/src/Makefile.am b/src/Makefile.am index 66440381a..ee7e17b14 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -131,7 +131,10 @@ testasyncgetprop_LDADD= @METACITY_LIBS@ desktopfilesdir=$(datadir)/gnome/wm-properties desktopfiles_in_files=metacity.desktop.in -desktopfiles_DATA = $(desktopfiles_in_files:.desktop.in=.desktop) +desktopfiles_files=$(desktopfiles_in_files:.desktop.in=.desktop) +if BUILD_CONFIG_DIALOG +desktopfiles_DATA = $(desktopfiles_files) +endif @INTLTOOL_DESKTOP_RULE@ schemadir = @GCONF_SCHEMA_FILE_DIR@ @@ -159,7 +162,7 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libmetacity-private.pc -EXTRA_DIST=$(desktopfiles_DATA) \ +EXTRA_DIST=$(desktopfiles_files) \ $(IMAGES) $(schema_DATA) \ update-from-egg.sh \ $(desktopfiles_in_files) \