summaryrefslogtreecommitdiff
path: root/src/Makefile.am
diff options
context:
space:
mode:
authorVincent Untz <vuntz@gnome.org>2008-09-12 04:05:17 +0000
committerThomas James Alexander Thurman <tthurman@src.gnome.org>2008-09-12 04:05:17 +0000
commit3109a67a719d3bdf1bf4166bb2f1e547c0db8188 (patch)
tree6b0efd19740816dbabeb2b1ea2649a75633b6181 /src/Makefile.am
parentd4662bb6a2588e0269340ec143e0390a8782d2ba (diff)
downloadmetacity-3109a67a719d3bdf1bf4166bb2f1e547c0db8188.tar.gz
metacity-3109a67a719d3bdf1bf4166bb2f1e547c0db8188.tar.bz2
Install desktop files in both .../share/applications and
2008-09-12 Vincent Untz <vuntz@gnome.org> Install desktop files in both .../share/applications and .../share/gnome/wm-properties. Copied in from the 2.23.x branch. Closes #549479. * src/metacity-wm.desktop.in: new file * src/.cvsignore: include the above * src/Makefile.am: install the above svn path=/trunk/; revision=3886
Diffstat (limited to 'src/Makefile.am')
-rw-r--r--src/Makefile.am11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 5fcc637..fe6c2a4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -154,12 +154,17 @@ testboxes_LDADD= @METACITY_LIBS@
testgradient_LDADD= @METACITY_LIBS@
testasyncgetprop_LDADD= @METACITY_LIBS@
+@INTLTOOL_DESKTOP_RULE@
+
desktopfilesdir=$(datadir)/applications
desktopfiles_in_files=metacity.desktop.in
desktopfiles_files=$(desktopfiles_in_files:.desktop.in=.desktop)
desktopfiles_DATA = $(desktopfiles_files)
-@INTLTOOL_DESKTOP_RULE@
+wmpropertiesdir=$(datadir)/gnome/wm-properties
+wmproperties_in_files=metacity-wm.desktop.in
+wmproperties_files=$(wmproperties_in_files:.desktop.in=.desktop)
+wmproperties_DATA = $(wmproperties_files)
schemadir = @GCONF_SCHEMA_FILE_DIR@
schema_in_files = metacity.schemas.in
@@ -186,7 +191,7 @@ VARIABLES=stock_maximize_data $(srcdir)/stock_maximize.png \
stock_delete_data $(srcdir)/stock_delete.png
BUILT_SOURCES = inlinepixbufs.h
-CLEANFILES = inlinepixbufs.h metacity.desktop metacity.schemas 50-metacity-desktop-key.xml 50-metacity-key.xml
+CLEANFILES = inlinepixbufs.h metacity.desktop metacity-wm.desktop metacity.schemas 50-metacity-desktop-key.xml 50-metacity-key.xml
inlinepixbufs.h: $(IMAGES)
$(GDK_PIXBUF_CSOURCE) --raw --build-list $(VARIABLES) >$(srcdir)/inlinepixbufs.h
@@ -196,8 +201,10 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libmetacity-private.pc
EXTRA_DIST=$(desktopfiles_files) \
+ $(wmproperties_files) \
$(IMAGES) $(schema_DATA) \
$(desktopfiles_in_files) \
+ $(wmproperties_in_files) \
$(schema_in_files) \
$(xml_in_files) \
libmetacity-private.pc.in