summaryrefslogtreecommitdiff
path: root/data/Makefile.am
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2013-09-11 01:01:44 -0700
committerStefano Karapetsas <[email protected]>2013-09-11 01:01:44 -0700
commit2a7238bee32de88d24b541acdc06a1d1b3b73b02 (patch)
treeb33ee3e6052a3eb4c9731c649bcdae95054f613e /data/Makefile.am
parent48b2c97f8a0c7e8cc0d999d5c427c37daf5aabda (diff)
parent472993545c41fa1c77e672b3e4d0df205a6fa98f (diff)
downloadmate-user-share-2a7238bee32de88d24b541acdc06a1d1b3b73b02.tar.bz2
mate-user-share-2a7238bee32de88d24b541acdc06a1d1b3b73b02.tar.xz
Merge pull request #14 from NiceandGently/master
Add support for Apache HTTPD 2.4
Diffstat (limited to 'data/Makefile.am')
-rw-r--r--data/Makefile.am8
1 files changed, 5 insertions, 3 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index 953fa83..665cf93 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -7,10 +7,10 @@ desktop_in_files = mate-user-share-properties.desktop.in
autostartdir = $(sysconfdir)/xdg/autostart/
autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
-autostart_in_files = mate-user-share.desktop.in
+autostart_in_files = mate-user-share-obexftp.desktop.in mate-user-share-obexpush.desktop.in mate-user-share-webdav.desktop.in
appdir = $(datadir)/mate-user-share
-app_DATA=dav_user_2.0.conf dav_user_2.2.conf dav_groupfile file-share-properties.ui
+app_DATA=dav_user_2.0.conf dav_user_2.2.conf dav_user_2.4.conf dav_groupfile file-share-properties.ui
gsettings_SCHEMAS = org.mate.FileSharing.gschema.xml
@GSETTINGS_RULES@
@@ -21,7 +21,9 @@ convert_DATA = mate-user-share.convert
EXTRA_DIST = $(gsettings_SCHEMAS) \
$(app_DATA) \
$(desktop_in_files) \
- mate-user-share.desktop.in.in \
+ mate-user-share-obexftp.desktop.in.in \
+ mate-user-share-obexpush.desktop.in.in \
+ mate-user-share-webdav.desktop.in.in \
file-share-properties.ui
CLEANFILES = $(desktop_DATA) $(autostart_DATA)