]>
Commit | Line | Data |
---|---|---|
e8aeccb6 AM |
1 | diff -urN control-center-1.4.0.1.org/capplets/background-properties/Makefile.am control-center-1.4.0.1/capplets/background-properties/Makefile.am |
2 | --- control-center-1.4.0.1.org/capplets/background-properties/Makefile.am Sun Apr 1 18:49:14 2001 | |
3 | +++ control-center-1.4.0.1/capplets/background-properties/Makefile.am Sun Apr 1 18:52:37 2001 | |
4 | @@ -28,4 +28,4 @@ | |
5 | @XML_I18N_MERGE_DESKTOP_RULE@ | |
fac964b1 | 6 | |
15d3ce57 | 7 | install-data-local: |
8 | - $(INSTALL_DATA) $(srcdir)/background-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Desktop/background-properties.desktop | |
cb46b7d9 | 9 | + $(INSTALL_DATA) $(srcdir)/background-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Desktop/background-properties.desktop |
e8aeccb6 AM |
10 | diff -urN control-center-1.4.0.1.org/capplets/desktop-links/Makefile.am control-center-1.4.0.1/capplets/desktop-links/Makefile.am |
11 | --- control-center-1.4.0.1.org/capplets/desktop-links/Makefile.am Sun Apr 1 18:49:14 2001 | |
12 | +++ control-center-1.4.0.1/capplets/desktop-links/Makefile.am Sun Apr 1 18:52:37 2001 | |
b9d254ce | 13 | @@ -6,7 +6,7 @@ |
14 | Sessiondir = $(ccenterdir)/Session | |
15 | Documentsdir = $(ccenterdir)/Documents | |
16 | ||
17 | -paneldir = $(datadir)/gnome/apps/Settings | |
cb46b7d9 | 18 | +paneldir = $(datadir)/applnk/Settings/GNOME |
b9d254ce | 19 | Multimediadirp = $(paneldir)/Multimedia |
20 | Desktopdirp = $(paneldir)/Desktop | |
21 | UIOptionsdirp = $(paneldir)/UIOptions | |
e8aeccb6 AM |
22 | diff -urN control-center-1.4.0.1.org/capplets/file-types/Makefile.am control-center-1.4.0.1/capplets/file-types/Makefile.am |
23 | --- control-center-1.4.0.1.org/capplets/file-types/Makefile.am Sun Apr 1 18:49:14 2001 | |
24 | +++ control-center-1.4.0.1/capplets/file-types/Makefile.am Sun Apr 1 18:54:13 2001 | |
25 | @@ -42,7 +42,7 @@ | |
26 | sys_in_files = file-types-capplet.desktop.in | |
27 | sys_DATA = $(sys_in_files:.desktop.in=.desktop) | |
28 | ||
29 | -settingsdir = $(datadir)/gnome/apps/Settings | |
30 | +settingsdir = $(datadir)/applnk/Settings | |
31 | settings_DATA = $(sys_DATA) | |
32 | ||
33 | @XML_I18N_MERGE_DESKTOP_RULE@ | |
e8aeccb6 AM |
34 | diff -urN control-center-1.4.0.1.org/capplets/gnome-edit-properties/Makefile.am control-center-1.4.0.1/capplets/gnome-edit-properties/Makefile.am |
35 | --- control-center-1.4.0.1.org/capplets/gnome-edit-properties/Makefile.am Sun Apr 1 18:49:14 2001 | |
36 | +++ control-center-1.4.0.1/capplets/gnome-edit-properties/Makefile.am Sun Apr 1 18:52:37 2001 | |
37 | @@ -24,4 +24,4 @@ | |
38 | @XML_I18N_MERGE_DESKTOP_RULE@ | |
fac964b1 | 39 | |
15d3ce57 | 40 | install-data-local: |
b9d254ce | 41 | - $(INSTALL_DATA) $(srcdir)/gnome-edit-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Documents/gnome-edit-properties.desktop |
cb46b7d9 | 42 | + $(INSTALL_DATA) $(srcdir)/gnome-edit-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Documents/gnome-edit-properties.desktop |
e8aeccb6 AM |
43 | diff -urN control-center-1.4.0.1.org/capplets/keyboard-properties/Makefile.am control-center-1.4.0.1/capplets/keyboard-properties/Makefile.am |
44 | --- control-center-1.4.0.1.org/capplets/keyboard-properties/Makefile.am Sun Apr 1 18:49:14 2001 | |
45 | +++ control-center-1.4.0.1/capplets/keyboard-properties/Makefile.am Sun Apr 1 18:52:37 2001 | |
46 | @@ -22,4 +22,4 @@ | |
47 | @XML_I18N_MERGE_DESKTOP_RULE@ | |
fac964b1 | 48 | |
49 | install-data-local: | |
15d3ce57 | 50 | - $(INSTALL_DATA) $(srcdir)/keyboard-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Peripherals/keyboard-properties.desktop |
cb46b7d9 | 51 | + $(INSTALL_DATA) $(srcdir)/keyboard-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Peripherals/keyboard-properties.desktop |
e8aeccb6 AM |
52 | diff -urN control-center-1.4.0.1.org/capplets/mouse-properties/Makefile.am control-center-1.4.0.1/capplets/mouse-properties/Makefile.am |
53 | --- control-center-1.4.0.1.org/capplets/mouse-properties/Makefile.am Sun Apr 1 18:49:14 2001 | |
54 | +++ control-center-1.4.0.1/capplets/mouse-properties/Makefile.am Sun Apr 1 18:52:39 2001 | |
15d3ce57 | 55 | @@ -23,4 +23,4 @@ |
e8aeccb6 | 56 | @XML_I18N_MERGE_DESKTOP_RULE@ |
fac964b1 | 57 | |
15d3ce57 | 58 | install-data-local: |
59 | - $(INSTALL_DATA) $(srcdir)/mouse-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Peripherals/mouse-properties.desktop | |
cb46b7d9 | 60 | + $(INSTALL_DATA) $(srcdir)/mouse-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Peripherals/mouse-properties.desktop |
e8aeccb6 AM |
61 | diff -urN control-center-1.4.0.1.org/capplets/screensaver-properties/Makefile.am control-center-1.4.0.1/capplets/screensaver-properties/Makefile.am |
62 | --- control-center-1.4.0.1.org/capplets/screensaver-properties/Makefile.am Sun Apr 1 18:49:13 2001 | |
63 | +++ control-center-1.4.0.1/capplets/screensaver-properties/Makefile.am Sun Apr 1 18:52:39 2001 | |
64 | @@ -31,4 +31,4 @@ | |
65 | @XML_I18N_MERGE_DESKTOP_RULE@ | |
fac964b1 | 66 | |
15d3ce57 | 67 | install-data-local: |
68 | - $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Desktop/screensaver-properties.desktop | |
cb46b7d9 | 69 | + $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Desktop/screensaver-properties.desktop |
e8aeccb6 AM |
70 | diff -urN control-center-1.4.0.1.org/capplets/sound-properties/Makefile.am control-center-1.4.0.1/capplets/sound-properties/Makefile.am |
71 | --- control-center-1.4.0.1.org/capplets/sound-properties/Makefile.am Sun Apr 1 18:49:14 2001 | |
72 | +++ control-center-1.4.0.1/capplets/sound-properties/Makefile.am Sun Apr 1 18:52:39 2001 | |
73 | @@ -24,4 +24,4 @@ | |
74 | @XML_I18N_MERGE_DESKTOP_RULE@ | |
fac964b1 | 75 | |
15d3ce57 | 76 | install-data-local: |
77 | - $(INSTALL_DATA) $(srcdir)/sound-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Multimedia/sound-properties.desktop | |
cb46b7d9 | 78 | + $(INSTALL_DATA) $(srcdir)/sound-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Multimedia/sound-properties.desktop |
e8aeccb6 AM |
79 | diff -urN control-center-1.4.0.1.org/capplets/theme-switcher/Makefile.am control-center-1.4.0.1/capplets/theme-switcher/Makefile.am |
80 | --- control-center-1.4.0.1.org/capplets/theme-switcher/Makefile.am Sun Apr 1 18:49:14 2001 | |
81 | +++ control-center-1.4.0.1/capplets/theme-switcher/Makefile.am Sun Apr 1 18:52:39 2001 | |
82 | @@ -34,4 +34,4 @@ | |
83 | @XML_I18N_MERGE_DESKTOP_RULE@ | |
fac964b1 | 84 | |
15d3ce57 | 85 | install-data-local: |
86 | - $(INSTALL_DATA) $(srcdir)/theme-selector.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Desktop/theme-selector.desktop | |
cb46b7d9 | 87 | + $(INSTALL_DATA) $(srcdir)/theme-selector.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Desktop/theme-selector.desktop |
e8aeccb6 AM |
88 | diff -urN control-center-1.4.0.1.org/capplets/url-properties/Makefile.am control-center-1.4.0.1/capplets/url-properties/Makefile.am |
89 | --- control-center-1.4.0.1.org/capplets/url-properties/Makefile.am Sun Apr 1 18:49:14 2001 | |
90 | +++ control-center-1.4.0.1/capplets/url-properties/Makefile.am Sun Apr 1 18:52:39 2001 | |
91 | @@ -24,4 +24,4 @@ | |
92 | @XML_I18N_MERGE_DESKTOP_RULE@ | |
fac964b1 | 93 | |
15d3ce57 | 94 | install-data-local: |
b9d254ce | 95 | - $(INSTALL_DATA) $(srcdir)/url-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Documents/url-properties.desktop |
cb46b7d9 | 96 | + $(INSTALL_DATA) $(srcdir)/url-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Documents/url-properties.desktop |
e8aeccb6 AM |
97 | diff -urN control-center-1.4.0.1.org/capplets/wm-properties/Makefile.am control-center-1.4.0.1/capplets/wm-properties/Makefile.am |
98 | --- control-center-1.4.0.1.org/capplets/wm-properties/Makefile.am Sun Apr 1 18:49:14 2001 | |
99 | +++ control-center-1.4.0.1/capplets/wm-properties/Makefile.am Sun Apr 1 18:55:37 2001 | |
100 | @@ -26,7 +26,7 @@ | |
101 | sys_in_files = wm-properties.desktop.in | |
102 | sys_DATA = $(sys_in_files:.desktop.in=.desktop) | |
fac964b1 | 103 | |
15d3ce57 | 104 | -Setdir = $(datadir)/gnome/apps/Settings/Desktop |
e8aeccb6 AM |
105 | +Setdir = $(datadir)/applnk/Settings/Desktop |
106 | ||
107 | Set_DATA = $(sys_DATA) | |
108 | ||
109 | diff -urN control-center-1.4.0.1.org/control-center/Makefile.am control-center-1.4.0.1/control-center/Makefile.am | |
110 | --- control-center-1.4.0.1.org/control-center/Makefile.am Sun Apr 1 18:49:15 2001 | |
111 | +++ control-center-1.4.0.1/control-center/Makefile.am Sun Apr 1 18:56:01 2001 | |
b9d254ce | 112 | @@ -47,7 +47,7 @@ |
113 | ||
e8aeccb6 | 114 | EXTRA_DIST = gnomecc.desktop.in cappletConf.sh.in $(appicon_DATA) $(splash_DATA) |
fac964b1 | 115 | |
116 | -sysdir = $(datadir)/gnome/apps/Settings | |
117 | +sysdir = $(datadir)/applnk/Settings | |
e8aeccb6 AM |
118 | sys_in_files = gnomecc.desktop.in |
119 | sys_DATA = $(sys_in_files:.desktop.in=.desktop) | |
120 | @XML_I18N_MERGE_DESKTOP_RULE@ | |
121 | diff -urN control-center-1.4.0.1.org/control-center-applnk.patch control-center-1.4.0.1/control-center-applnk.patch | |
122 | --- control-center-1.4.0.1.org/control-center-applnk.patch Thu Jan 1 01:00:00 1970 | |
123 | +++ control-center-1.4.0.1/control-center-applnk.patch Sun Apr 1 18:46:58 2001 | |
124 | @@ -0,0 +1,128 @@ | |
125 | +diff -Nru control-center-1.2.3/capplets/background-properties/Makefile.am control-center-1.2.3.new/capplets/background-properties/Makefile.am | |
126 | +--- control-center-1.2.3/capplets/background-properties/Makefile.am Tue Feb 20 02:32:44 2001 | |
127 | ++++ control-center-1.2.3.new/capplets/background-properties/Makefile.am Tue Feb 20 02:33:18 2001 | |
128 | +@@ -26,4 +26,4 @@ | |
129 | + sys_DATA = background-properties.desktop | |
130 | + | |
131 | + install-data-local: | |
132 | +- $(INSTALL_DATA) $(srcdir)/background-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Desktop/background-properties.desktop | |
133 | ++ $(INSTALL_DATA) $(srcdir)/background-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Desktop/background-properties.desktop | |
134 | +diff -Nru control-center-1.2.3/capplets/desktop-links/Makefile.am control-center-1.2.3.new/capplets/desktop-links/Makefile.am | |
135 | +--- control-center-1.2.3/capplets/desktop-links/Makefile.am Tue Feb 20 02:32:44 2001 | |
136 | ++++ control-center-1.2.3.new/capplets/desktop-links/Makefile.am Tue Feb 20 02:33:37 2001 | |
137 | +@@ -6,7 +6,7 @@ | |
138 | + Sessiondir = $(ccenterdir)/Session | |
139 | + Documentsdir = $(ccenterdir)/Documents | |
140 | + | |
141 | +-paneldir = $(datadir)/gnome/apps/Settings | |
142 | ++paneldir = $(datadir)/applnk/Settings/GNOME | |
143 | + Multimediadirp = $(paneldir)/Multimedia | |
144 | + Desktopdirp = $(paneldir)/Desktop | |
145 | + UIOptionsdirp = $(paneldir)/UIOptions | |
146 | +diff -Nru control-center-1.2.3/capplets/gnome-edit-properties/Makefile.am control-center-1.2.3.new/capplets/gnome-edit-properties/Makefile.am | |
147 | +--- control-center-1.2.3/capplets/gnome-edit-properties/Makefile.am Tue Feb 20 02:32:44 2001 | |
148 | ++++ control-center-1.2.3.new/capplets/gnome-edit-properties/Makefile.am Tue Feb 20 02:33:59 2001 | |
149 | +@@ -21,4 +21,4 @@ | |
150 | + sys_DATA = gnome-edit-properties.desktop | |
151 | + | |
152 | + install-data-local: | |
153 | +- $(INSTALL_DATA) $(srcdir)/gnome-edit-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Documents/gnome-edit-properties.desktop | |
154 | ++ $(INSTALL_DATA) $(srcdir)/gnome-edit-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Documents/gnome-edit-properties.desktop | |
155 | +diff -Nru control-center-1.2.3/capplets/keyboard-properties/Makefile.am control-center-1.2.3.new/capplets/keyboard-properties/Makefile.am | |
156 | +--- control-center-1.2.3/capplets/keyboard-properties/Makefile.am Tue Feb 20 02:32:44 2001 | |
157 | ++++ control-center-1.2.3.new/capplets/keyboard-properties/Makefile.am Tue Feb 20 02:34:28 2001 | |
158 | +@@ -19,4 +19,4 @@ | |
159 | + sys_DATA = keyboard-properties.desktop | |
160 | + | |
161 | + install-data-local: | |
162 | +- $(INSTALL_DATA) $(srcdir)/keyboard-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Peripherals/keyboard-properties.desktop | |
163 | ++ $(INSTALL_DATA) $(srcdir)/keyboard-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Peripherals/keyboard-properties.desktop | |
164 | +diff -Nru control-center-1.2.3/capplets/mime-type/Makefile.am control-center-1.2.3.new/capplets/mime-type/Makefile.am | |
165 | +--- control-center-1.2.3/capplets/mime-type/Makefile.am Tue Feb 20 02:32:44 2001 | |
166 | ++++ control-center-1.2.3.new/capplets/mime-type/Makefile.am Tue Feb 20 02:34:42 2001 | |
167 | +@@ -23,4 +23,4 @@ | |
168 | + sys_DATA = mime-type.desktop | |
169 | + | |
170 | + install-data-local: | |
171 | +- $(INSTALL_DATA) $(srcdir)/mime-type.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Documents/mime-type.desktop | |
172 | ++ $(INSTALL_DATA) $(srcdir)/mime-type.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Documents/mime-type.desktop | |
173 | +diff -Nru control-center-1.2.3/capplets/mouse-properties/Makefile.am control-center-1.2.3.new/capplets/mouse-properties/Makefile.am | |
174 | +--- control-center-1.2.3/capplets/mouse-properties/Makefile.am Tue Feb 20 02:32:44 2001 | |
175 | ++++ control-center-1.2.3.new/capplets/mouse-properties/Makefile.am Tue Feb 20 02:34:57 2001 | |
176 | +@@ -20,4 +20,4 @@ | |
177 | + sys_DATA = mouse-properties.desktop | |
178 | + | |
179 | + install-data-local: | |
180 | +- $(INSTALL_DATA) $(srcdir)/mouse-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Peripherals/mouse-properties.desktop | |
181 | ++ $(INSTALL_DATA) $(srcdir)/mouse-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Peripherals/mouse-properties.desktop | |
182 | +diff -Nru control-center-1.2.3/capplets/screensaver-properties/Makefile.am control-center-1.2.3.new/capplets/screensaver-properties/Makefile.am | |
183 | +--- control-center-1.2.3/capplets/screensaver-properties/Makefile.am Tue Feb 20 02:32:44 2001 | |
184 | ++++ control-center-1.2.3.new/capplets/screensaver-properties/Makefile.am Tue Feb 20 02:35:13 2001 | |
185 | +@@ -29,4 +29,4 @@ | |
186 | + sys_DATA = screensaver-properties.desktop | |
187 | + | |
188 | + install-data-local: | |
189 | +- $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Desktop/screensaver-properties.desktop | |
190 | ++ $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Desktop/screensaver-properties.desktop | |
191 | +diff -Nru control-center-1.2.3/capplets/sound-properties/Makefile.am control-center-1.2.3.new/capplets/sound-properties/Makefile.am | |
192 | +--- control-center-1.2.3/capplets/sound-properties/Makefile.am Tue Feb 20 02:32:44 2001 | |
193 | ++++ control-center-1.2.3.new/capplets/sound-properties/Makefile.am Tue Feb 20 02:35:41 2001 | |
194 | +@@ -21,4 +21,4 @@ | |
195 | + sys_DATA = sound-properties.desktop | |
196 | + | |
197 | + install-data-local: | |
198 | +- $(INSTALL_DATA) $(srcdir)/sound-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Multimedia/sound-properties.desktop | |
199 | ++ $(INSTALL_DATA) $(srcdir)/sound-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Multimedia/sound-properties.desktop | |
200 | +diff -Nru control-center-1.2.3/capplets/theme-switcher/Makefile.am control-center-1.2.3.new/capplets/theme-switcher/Makefile.am | |
201 | +--- control-center-1.2.3/capplets/theme-switcher/Makefile.am Tue Feb 20 02:32:44 2001 | |
202 | ++++ control-center-1.2.3.new/capplets/theme-switcher/Makefile.am Tue Feb 20 02:35:55 2001 | |
203 | +@@ -31,4 +31,4 @@ | |
204 | + sys_DATA = theme-selector.desktop | |
205 | + | |
206 | + install-data-local: | |
207 | +- $(INSTALL_DATA) $(srcdir)/theme-selector.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Desktop/theme-selector.desktop | |
208 | ++ $(INSTALL_DATA) $(srcdir)/theme-selector.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Desktop/theme-selector.desktop | |
209 | +diff -Nru control-center-1.2.3/capplets/ui-properties/Makefile.am control-center-1.2.3.new/capplets/ui-properties/Makefile.am | |
210 | +--- control-center-1.2.3/capplets/ui-properties/Makefile.am Tue Feb 20 02:32:44 2001 | |
211 | ++++ control-center-1.2.3.new/capplets/ui-properties/Makefile.am Tue Feb 20 02:36:16 2001 | |
212 | +@@ -27,6 +27,6 @@ | |
213 | + mdi.desktop | |
214 | + | |
215 | + install-data-local: | |
216 | +- $(INSTALL_DATA) $(srcdir)/application.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/UIOptions/application.desktop | |
217 | +- $(INSTALL_DATA) $(srcdir)/dialogs.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/UIOptions/dialogs.desktop | |
218 | +- $(INSTALL_DATA) $(srcdir)/mdi.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/UIOptions/mdi.desktop | |
219 | ++ $(INSTALL_DATA) $(srcdir)/application.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/UIOptions/application.desktop | |
220 | ++ $(INSTALL_DATA) $(srcdir)/dialogs.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/UIOptions/dialogs.desktop | |
221 | ++ $(INSTALL_DATA) $(srcdir)/mdi.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/UIOptions/mdi.desktop | |
222 | +diff -Nru control-center-1.2.3/capplets/url-properties/Makefile.am control-center-1.2.3.new/capplets/url-properties/Makefile.am | |
223 | +--- control-center-1.2.3/capplets/url-properties/Makefile.am Tue Feb 20 02:32:44 2001 | |
224 | ++++ control-center-1.2.3.new/capplets/url-properties/Makefile.am Tue Feb 20 02:36:28 2001 | |
225 | +@@ -21,4 +21,4 @@ | |
226 | + sys_DATA = url-properties.desktop | |
227 | + | |
228 | + install-data-local: | |
229 | +- $(INSTALL_DATA) $(srcdir)/url-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Documents/url-properties.desktop | |
230 | ++ $(INSTALL_DATA) $(srcdir)/url-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Documents/url-properties.desktop | |
231 | +diff -Nru control-center-1.2.3/capplets/wm-properties/Makefile.am control-center-1.2.3.new/capplets/wm-properties/Makefile.am | |
232 | +--- control-center-1.2.3/capplets/wm-properties/Makefile.am Tue Feb 20 02:32:44 2001 | |
233 | ++++ control-center-1.2.3.new/capplets/wm-properties/Makefile.am Tue Feb 20 02:36:46 2001 | |
234 | +@@ -25,5 +25,5 @@ | |
235 | + sysdir = $(datadir)/control-center/Desktop | |
236 | + sys_DATA = wm-properties.desktop | |
237 | + | |
238 | +-Setdir = $(datadir)/gnome/apps/Settings/Desktop | |
239 | ++Setdir = $(datadir)/applnk/Settings/GNOME/Desktop | |
240 | + Set_DATA = wm-properties.desktop | |
241 | +diff -Nru control-center-1.2.3/control-center/Makefile.am control-center-1.2.3.new/control-center/Makefile.am | |
242 | +--- control-center-1.2.3/control-center/Makefile.am Tue Feb 20 02:32:44 2001 | |
243 | ++++ control-center-1.2.3.new/control-center/Makefile.am Tue Feb 20 02:31:47 2001 | |
244 | +@@ -47,7 +47,7 @@ | |
245 | + | |
246 | + EXTRA_DIST = gnomecc.desktop cappletConf.sh.in $(appicon_DATA) $(splash_DATA) | |
247 | + | |
248 | +-sysdir = $(datadir)/gnome/apps/Settings | |
249 | ++sysdir = $(datadir)/applnk/Settings | |
250 | + sys_DATA = gnomecc.desktop | |
251 | + | |
252 | + ## Put `exec' in the name because this should be installed by | |
58f485c3 | 253 | --- control-center-1.4.0.3/capplets/wm-properties/Makefile.am~ Fri Feb 8 17:48:27 2002 |
254 | +++ control-center-1.4.0.3/capplets/wm-properties/Makefile.am Fri Feb 8 17:48:27 2002 | |
255 | @@ -26,7 +26,7 @@ | |
256 | sys_in_files = wm-properties.desktop.in | |
257 | sys_DATA = $(sys_in_files:.desktop.in=.desktop) | |
258 | ||
259 | -Setdir = $(datadir)/applnk/Settings/Desktop | |
260 | +Setdir = $(datadir)/applnk/Settings/GNOME/Desktop | |
261 | ||
262 | Set_DATA = $(sys_DATA) | |
263 | ||
264 | --- control-center-1.4.0.3/capplets/file-types/Makefile.am~ Fri Feb 8 17:49:51 2002 | |
265 | +++ control-center-1.4.0.3/capplets/file-types/Makefile.am Fri Feb 8 17:49:51 2002 | |
266 | @@ -43,7 +43,7 @@ | |
267 | sys_in_files = file-types-capplet.desktop.in | |
268 | sys_DATA = $(sys_in_files:.desktop.in=.desktop) | |
269 | ||
270 | -settingsdir = $(datadir)/applnk/Settings | |
271 | +settingsdir = $(datadir)/applnk/GNOME/Settings | |
272 | settings_DATA = $(sys_DATA) | |
273 | ||
274 | @XML_I18N_MERGE_DESKTOP_RULE@ | |
275 | --- control-center-1.4.0.3/control-center/Makefile.am~ Fri Feb 8 17:52:16 2002 | |
276 | +++ control-center-1.4.0.3/control-center/Makefile.am Fri Feb 8 17:52:16 2002 | |
277 | @@ -47,7 +47,7 @@ | |
278 | ||
279 | EXTRA_DIST = gnomecc.desktop.in cappletConf.sh.in $(appicon_DATA) $(splash_DATA) | |
280 | ||
281 | -sysdir = $(datadir)/applnk/Settings | |
282 | +sysdir = $(datadir)/applnk/Settings/GNOME | |
283 | sys_in_files = gnomecc.desktop.in | |
284 | sys_DATA = $(sys_in_files:.desktop.in=.desktop) | |
285 | @XML_I18N_MERGE_DESKTOP_RULE@ |