summaryrefslogtreecommitdiff
path: root/src/tools/Makefile.am
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2002-12-13 22:20:31 +0000
committerHavoc Pennington <hp@src.gnome.org>2002-12-13 22:20:31 +0000
commitfd8c3514d6fb543e83560aa2194536e3093f13dd (patch)
treeacde669a42438fcc369bf5863acf0dc807756569 /src/tools/Makefile.am
parentc2700863ca39601d69b988ef8b51e1ab4c7b74b8 (diff)
downloadmetacity-fd8c3514d6fb543e83560aa2194536e3093f13dd.tar.gz
metacity-fd8c3514d6fb543e83560aa2194536e3093f13dd.tar.bz2
only install .desktop file for metacity-properties if we actually install
2002-12-13 Havoc Pennington <hp@redhat.com> * src/tools/Makefile.am (Desktop_in_files): only install .desktop file for metacity-properties if we actually install metacity-properties * src/display.c (event_callback): not focusing on button 2 click was crack, revert that change.
Diffstat (limited to 'src/tools/Makefile.am')
-rw-r--r--src/tools/Makefile.am12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am
index 13c5773..2d486d4 100644
--- a/src/tools/Makefile.am
+++ b/src/tools/Makefile.am
@@ -34,9 +34,15 @@ ui_DATA=metacity-properties.glade
propicondir=$(datadir)/pixmaps
propicon_DATA=metacity-properties.png
+METACITY_PROPERTIES_DESKTOP_IN=metacity-properties.desktop.in
+if BUILD_CONFIG_DIALOG
+METACITY_PROPERTIES_DESKTOP=metacity-properties.desktop
+else
+METACITY_PROPERTIES_DESKTOP=
+endif
+
desktopdir=$(datadir)/control-center-2.0/capplets
-Desktop_in_files=metacity-properties.desktop.in
-desktop_DATA=$(Desktop_in_files:.desktop.in=.desktop)
+desktop_DATA=$(METACITY_PROPERTIES_DESKTOP)
if BUILD_CONFIG_DIALOG
CONFIG_DIALOG=metacity-properties
@@ -57,5 +63,5 @@ if BUILD_CONFIG_DIALOG
metacity_properties_LDADD= @METACITY_PROPS_LIBS@
endif
-EXTRA_DIST=$(icon_DATA) $(ui_DATA) $(propicon_DATA) $(Desktop_in_files)
+EXTRA_DIST=$(icon_DATA) $(ui_DATA) $(propicon_DATA) $(METACITY_PROPERTIES_DESKTOP_IN)