diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | src/Makefile.am | 7 |
2 files changed, 11 insertions, 2 deletions
@@ -1,3 +1,9 @@ +2003-01-10 Havoc Pennington <hp@redhat.com> + + * 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 <hp@pobox.com> * NEWS: update diff --git a/src/Makefile.am b/src/Makefile.am index 66440381..ee7e17b1 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) \ |