gnome-user-share r233 - in trunk: . data

[hadess svn gnome org]

Author: hadess
Date: Mon Mar 31 18:25:34 2008
New Revision: 233
URL: http://svn.gnome.org/viewvc/gnome-user-share?rev=233&view=rev

Log:
2008-03-31  Bastien Nocera  <hadess hadess net>

	* data/Makefile.am: Don't ship dav_user_2.2.conf in the tarball,
	spotted by Thorsten Vollmer <thorsten thvo de> (Closes: #525372)



Modified:
   trunk/ChangeLog
   trunk/data/Makefile.am

Modified: trunk/data/Makefile.am
==============================================================================
--- trunk/data/Makefile.am	(original)
+++ trunk/data/Makefile.am	Mon Mar 31 18:25:34 2008
@@ -18,7 +18,10 @@
 	$(GTK_BUILDER_CONVERT) file-share-properties.glade file-share-properties.ui
 
 appdir = $(datadir)/gnome-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_groupfile file-share-properties.ui
+
+appconfdir = $(datadir)/gnome-user-share
+appconf_DATA = dav_user_2.2.conf
 
 dav_user_2.2.conf: dav_user_2.2.conf.in
 	sed "s,@DATADIR@,$(datadir)," dav_user_2.2.conf.in | \
@@ -46,4 +49,4 @@
 
 CLEANFILES = $(desktop_DATA) $(autostart_DATA) file-share-properties.ui dav_user_2.2.conf
 
-DISTCLEANFILES = $(schema_DATA) 
+DISTCLEANFILES = $(schema_DATA) dav_user_2.2.conf