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

[hadess svn gnome org]

Author: hadess
Date: Tue Mar 25 15:38:52 2008
New Revision: 228
URL: http://svn.gnome.org/viewvc/gnome-user-share?rev=228&view=rev

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

	* data/Makefile.am: Generate the dav_user_2.2.conf
	file so the location of the dav_groupfile is the
	one used in the installation
	* data/dav_user_2.2.conf: Rename to...
	* data/dav_user_2.2.conf.in: ... this



Added:
   trunk/data/dav_user_2.2.conf.in
      - copied, changed from r227, /trunk/data/dav_user_2.2.conf
Removed:
   trunk/data/dav_user_2.2.conf
Modified:
   trunk/ChangeLog
   trunk/data/Makefile.am

Modified: trunk/data/Makefile.am
==============================================================================
--- trunk/data/Makefile.am	(original)
+++ trunk/data/Makefile.am	Tue Mar 25 15:38:52 2008
@@ -20,6 +20,9 @@
 appdir = $(datadir)/gnome-user-share
 app_DATA=dav_user_2.0.conf dav_user_2.2.conf dav_groupfile file-share-properties.ui
 
+dav_user_2.2.conf: dav_user_2.2.conf.in
+	sed "s,@DATADIR@,$(datadir)," dav_user_2.2.conf.in > $@
+
 install-data-local:
 if GCONF_SCHEMAS_INSTALL
 	-GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
@@ -36,9 +39,10 @@
 EXTRA_DIST = $(schema_in_files) \
 	$(app_DATA)		\
 	$(desktop_in_files)	\
+	dav_user_2.2.conf.in	\
 	gnome-user-share.desktop.in.in \
 	file-share-properties.glade
 
-CLEANFILES = $(desktop_DATA) $(autostart_DATA) file-share-properties.ui
+CLEANFILES = $(desktop_DATA) $(autostart_DATA) file-share-properties.ui dav_user_2.2.conf
 
 DISTCLEANFILES = $(schema_DATA) 

Copied: trunk/data/dav_user_2.2.conf.in (from r227, /trunk/data/dav_user_2.2.conf)
==============================================================================
--- /trunk/data/dav_user_2.2.conf	(original)
+++ trunk/data/dav_user_2.2.conf.in	Tue Mar 25 15:38:52 2008
@@ -25,7 +25,7 @@
 
   AuthDigestProvider file
   AuthUserFile ${HOME}/.gnome2/user-share/passwd
-  AuthGroupFile /usr/share/gnome-user-share/dav_groupfile
+  AuthGroupFile @DATADIR@/gnome-user-share/dav_groupfile
 
 
   <IfDefine RequirePasswordAlways>