[evolution-patches] Fix for cde_app_root installation



This patch causes the cde_app_root data to be installed to the
proper privdatadir location rather than the current
$(prefix)/share/evolution-$(BASE_VERSION) which is inconsistent
with the current installation scheme of data for the rest of
evolution.

-- dobey

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/ChangeLog,v
retrieving revision 1.1192
diff -u -r1.1192 ChangeLog
--- ChangeLog	22 Apr 2003 14:54:15 -0000	1.1192
+++ ChangeLog	28 Apr 2003 12:09:31 -0000
@@ -1,3 +1,8 @@
+2003-04-28  Rodney Dawes  <dobey ximian com>
+
+	* data/cde_app_root/: Use $(privdatadir) instead of
+	$(prefix)/share/evolution-$(BASE_VERSION) for the cde stuff
+	
 2003-04-21  Rodney Dawes  <dobey ximian com>
 
 	* configure.in: Fix KDE_APPLNK_DIR to not install to a diff prefix,
Index: data/cde_app_root/dt/appconfig/appmanager/C/Ximian/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/data/cde_app_root/dt/appconfig/appmanager/C/Ximian/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- data/cde_app_root/dt/appconfig/appmanager/C/Ximian/Makefile.am	22 Jan 2003 20:02:31 -0000	1.3
+++ data/cde_app_root/dt/appconfig/appmanager/C/Ximian/Makefile.am	28 Apr 2003 12:09:31 -0000
@@ -1,6 +1,6 @@
 EXTRA_DIST = Evolution
 
 if HAVE_DTAPPINTEGRATE
-cdeappmanagerdir = $(prefix)/share/evolution-$(BASE_VERSION)/cde_app_root/dt/appconfig/appmanager/C/Ximian
+cdeappmanagerdir = $(privdatadir)/cde_app_root/dt/appconfig/appmanager/C/Ximian
 cdeappmanager_SCRIPTS = Evolution
 endif
Index: data/cde_app_root/dt/appconfig/icons/C/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/data/cde_app_root/dt/appconfig/icons/C/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- data/cde_app_root/dt/appconfig/icons/C/Makefile.am	22 Jan 2003 20:02:31 -0000	1.3
+++ data/cde_app_root/dt/appconfig/icons/C/Makefile.am	28 Apr 2003 12:09:31 -0000
@@ -9,7 +9,7 @@
 EXTRA_DIST = $(ICONS)
 
 if HAVE_DTAPPINTEGRATE
-cdeiconsdir = $(prefix)/share/evolution-$(BASE_VERSION)/cde_app_root/dt/appconfig/icons/C
+cdeiconsdir = $(privdatadir)/cde_app_root/dt/appconfig/icons/C
 cdeicons_DATA = $(ICONS)
 endif
 
Index: data/cde_app_root/dt/appconfig/types/C/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/data/cde_app_root/dt/appconfig/types/C/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- data/cde_app_root/dt/appconfig/types/C/Makefile.am	22 Jan 2003 20:02:30 -0000	1.3
+++ data/cde_app_root/dt/appconfig/types/C/Makefile.am	28 Apr 2003 12:09:31 -0000
@@ -1,6 +1,6 @@
 EXTRA_DIST = Ximian.dt.in
 
 if HAVE_DTAPPINTEGRATE
-cdetypesdir = $(prefix)/share/evolution-$(BASE_VERSION)/cde_app_root/dt/appconfig/types/C
+cdetypesdir = $(privdatadir)/cde_app_root/dt/appconfig/types/C
 cdetypes_DATA = Ximian.dt
-endif
\ No newline at end of file
+endif


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]