summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2003-01-10 20:45:34 +0000
committerHavoc Pennington <hp@src.gnome.org>2003-01-10 20:45:34 +0000
commit9073724c2ba27b08ca85fe1cfcb2dca05139f227 (patch)
tree4802591c23a609b0e698c8ce1bfac3c90761a1ad
parent92c8ba04976f02157949b337f764ff3b04e06ce3 (diff)
downloadmetacity-9073724c2ba27b08ca85fe1cfcb2dca05139f227.tar.gz
metacity-9073724c2ba27b08ca85fe1cfcb2dca05139f227.tar.bz2
revert that change, I got the wrong .desktop file. doh.
2003-01-10 Havoc Pennington <hp@redhat.com> * src/Makefile.am (desktopfiles_in_files): revert that change, I got the wrong .desktop file. doh.
-rw-r--r--ChangeLog5
-rw-r--r--src/Makefile.am2
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 908af36..b409a17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2003-01-10 Havoc Pennington <hp@redhat.com>
+ * src/Makefile.am (desktopfiles_in_files): revert that change, I
+ got the wrong .desktop file. doh.
+
+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.
diff --git a/src/Makefile.am b/src/Makefile.am
index ee7e17b..3571b85 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -132,9 +132,7 @@ testasyncgetprop_LDADD= @METACITY_LIBS@
desktopfilesdir=$(datadir)/gnome/wm-properties
desktopfiles_in_files=metacity.desktop.in
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@