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

[hadess svn gnome org]

Author: hadess
Date: Tue Mar  4 11:31:46 2008
New Revision: 218
URL: http://svn.gnome.org/viewvc/gnome-user-share?rev=218&view=rev

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

	* data/Makefile.am: Fix dav configuration linking, again



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

Modified: trunk/data/Makefile.am
==============================================================================
--- trunk/data/Makefile.am	(original)
+++ trunk/data/Makefile.am	Tue Mar  4 11:31:46 2008
@@ -17,21 +17,18 @@
 appdir = $(datadir)/gnome-user-share
 app_DATA=dav_user_2.0.conf dav_user_2.2.conf dav_groupfile file-share-properties.glade
 
-if GCONF_SCHEMAS_INSTALL
 install-data-local:
+if GCONF_SCHEMAS_INSTALL
 	-GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
 	$(GCONFTOOL) --makefile-install-rule $(schema_DATA)
 endif
+	ln -sf dav_user_$(HTTPD_VERSION).conf $(DESTDIR)$(appdir)/dav_user.conf
 
 if GCONF_SCHEMAS_INSTALL
 uninstall-local:
 	-GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
 	$(GCONFTOOL) --makefile-uninstall-rule $(schema_DATA)
 else
-install-data-local:
-endif
-	ln -sf dav_user_$(HTTPD_VERSION).conf $(DESTDIR)$(appdir)/dav_user.conf
-
 
 EXTRA_DIST = $(schema_in_files) \
 	$(app_DATA)		\