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