Commit 9f6d984ed8631c31cc02f193ce08336e6c741d28

Authored by Silvan Calarco
1 parent 9a2f5e6c7c
Exists in master

Makefile: install or link configurations and data in kde5 directories

Showing 1 changed file with 40 additions and 35 deletions Side-by-side Diff

... ... @@ -40,14 +40,15 @@
40 40 bootrecoverdatadir = ${datadir}/openmamba/bootrecover
41 41 iconsdir = ${datadir}/icons/hicolor
42 42 kdeprefixdir = $(shell kde4-config --prefix)
43   -kdedatadir = $(kdeprefixdir)/share
44   -kdebindir = $(kdeprefixdir)/bin
  43 +kdedatadir = ${kdeprefixdir}/share
  44 +kde5datadir = ${prefix}/share
  45 +kdebindir = ${kdeprefixdir}/bin
45 46 kdeautostartdir = ${kdedatadir}/autostart
46 47 kdeconfigdir = ${kdedatadir}/config
47 48 kde5configdir = ${sysconfdir}/xdg
48 49 kdewallpapersdir = ${kdedatadir}/wallpapers
49 50 kdeappsdir = ${kdedatadir}/apps
50   -kdeplasmadesktopupdatesdir = ${kdeappsdir}/plasma-desktop/updates
  51 +kde5appsdir = ${prefix}/share
51 52 localesdir = ${kdedatadir}/locale
52 53  
53 54 xdg_appsdir = ${datadir}/applications
54 55  
55 56  
56 57  
57 58  
... ... @@ -130,46 +131,51 @@
130 131 @$(INSTALL_DIR) $(DESTDIR)$(bindir)
131 132 @$(INSTALL_DIR) $(DESTDIR)$(datadir)
132 133 @$(INSTALL_DIR) $(DESTDIR)$(sbindir)
133   - @$(INSTALL_DIR) $(DESTDIR)$(distrobindir)
134   - @$(INSTALL_DIR) $(DESTDIR)$(distrokdedir)
135   - @$(INSTALL_DIR) $(DESTDIR)$(kdedatadir)
  134 + @$(INSTALL_DIR) $(DESTDIR)$(kde5datadir)
136 135 @$(INSTALL_DIR) $(DESTDIR)$(kdeautostartdir)
137 136 @$(INSTALL_DIR) $(DESTDIR)$(kdebindir)
138 137 @$(INSTALL_DIR) $(DESTDIR)$(kdeconfigdir)
139 138 @$(INSTALL_DIR) $(DESTDIR)$(kde5configdir)
140 139 @$(INSTALL_DIR) $(DESTDIR)$(kdewallpapersdir)
141   - @$(INSTALL_DIR) $(DESTDIR)$(kdeplasmadesktopupdatesdir)
142   - @$(INSTALL_DIR) $(DESTDIR)$(kdedatadir)/apps/color-schemes
143   - @$(INSTALL_DIR) $(DESTDIR)$(kdedatadir)/apps/konqueror/profiles
144   - @$(INSTALL_DIR) $(DESTDIR)$(kdedatadir)/apps/konsole
145   - @$(INSTALL_DIR) $(DESTDIR)$(kdedatadir)/apps/plasma-desktop/init
146   - @$(INSTALL_DIR) $(DESTDIR)$(kdedatadir)/apps/plasma-desktop/updates
  140 + @$(INSTALL_DIR) $(DESTDIR)$(kdeappsdir)
  141 + @$(INSTALL_DIR) $(DESTDIR)$(kdeappsdir)/color-schemes
  142 + @$(INSTALL_DIR) $(DESTDIR)$(kde5appsdir)/color-schemes
  143 + @$(INSTALL_DIR) $(DESTDIR)$(kdeappsdir)/konqueror/profiles
  144 + @$(INSTALL_DIR) $(DESTDIR)$(kde5appsdir)/konqueror/profiles
  145 + @$(INSTALL_DIR) $(DESTDIR)$(kdeappsdir)/konsole
  146 + @$(INSTALL_DIR) $(DESTDIR)$(kde5appsdir)/konsole
  147 + @$(INSTALL_DIR) $(DESTDIR)$(kdeappsdir)/plasma-desktop/init
  148 + @$(INSTALL_DIR) $(DESTDIR)$(kdeappsdir)/plasma-desktop/updates
147 149 $(INSTALL_DATA) etc/pam.d/kde $(DESTDIR)$(sysconfdir)/pam.d/
148 150 $(INSTALL_DATA) etc/pam.d/kde-np $(DESTDIR)$(sysconfdir)/pam.d/
149 151 $(INSTALL_DATA) etc/sudoers.d/kde4 $(DESTDIR)$(sysconfdir)/sudoers.d/kde4
150   - $(INSTALL_DATA) kde/apps/color-schemes/OpenmambaGreen.colors $(DESTDIR)$(kdedatadir)/apps/color-schemes/OpenmambaGreen.colors
151   - $(INSTALL_DATA) kde/apps/konqueror/profiles/resourcesbrowsing $(DESTDIR)$(kdedatadir)/apps/konqueror/profiles/resourcesbrowsing
152   - $(INSTALL_DATA) kde/apps/konsole/openmamba.profile $(DESTDIR)$(kdedatadir)/apps/konsole/openmamba.profile
153   - $(INSTALL_DATA) kde/apps/plasma-desktop/init/10-openmamba-default-setup.js $(DESTDIR)$(kdedatadir)/apps/plasma-desktop/init/10-openmamba-default-setup.js
154   - $(INSTALL_DATA) kde/apps/plasma-desktop/updates/10-openmamba-theme.js $(DESTDIR)$(kdedatadir)/apps/plasma-desktop/updates/10-openmamba-theme.js
  152 + $(INSTALL_DATA) kde/apps/color-schemes/OpenmambaGreen.colors $(DESTDIR)$(kde5appsdir)/color-schemes/OpenmambaGreen.colors
  153 + $(INSTALL_DATA) kde/apps/color-schemes/OpenmambaGreen.colors $(DESTDIR)$(kdeappsdir)/color-schemes/OpenmambaGreen.colors
  154 + $(INSTALL_DATA) kde/apps/konqueror/profiles/resourcesbrowsing $(DESTDIR)$(kde5appsdir)/konqueror/profiles/resourcesbrowsing
  155 + $(INSTALL_DATA) kde/apps/konqueror/profiles/resourcesbrowsing $(DESTDIR)$(kdeappsdir)/konqueror/profiles/resourcesbrowsing
  156 + $(INSTALL_DATA) kde/apps/konsole/openmamba.profile $(DESTDIR)$(kde5appsdir)/konsole/openmamba.profile
  157 + $(INSTALL_DATA) kde/apps/konsole/openmamba.profile $(DESTDIR)$(kdeappsdir)/konsole/openmamba.profile
  158 + $(INSTALL_DATA) kde/apps/plasma-desktop/init/10-openmamba-default-setup.js $(DESTDIR)$(kdeappsdir)/plasma-desktop/init/10-openmamba-default-setup.js
  159 + $(INSTALL_DATA) kde/apps/plasma-desktop/updates/10-openmamba-theme.js $(DESTDIR)$(kdeappsdir)/plasma-desktop/updates/10-openmamba-theme.js
155 160 $(INSTALL_DATA) kde/autostart/mambatray.desktop $(DESTDIR)$(kdeautostartdir)/mambatray.desktop
156   - $(INSTALL_DATA) kde/config/kcmfonts $(DESTDIR)$(kdeconfigdir)/kcmfonts
157   - $(INSTALL_DATA) kde/config/kcminputrc $(DESTDIR)$(kdeconfigdir)/kcminputrc
  161 + $(INSTALL_DATA) kde/config/kcmfonts $(DESTDIR)$(kde5configdir)/kcmfonts
  162 + $(INSTALL_DATA) kde/config/kcmfonts $(DESTDIR)$(kde5configdir)/kcmfonts
  163 + $(INSTALL_DATA) kde/config/kcminputrc $(DESTDIR)$(kde5configdir)/kcminputrc
158 164 $(INSTALL_DATA) kde/config/kdeglobals $(DESTDIR)$(kde5configdir)/kdeglobals
159   - $(INSTALL_DATA) kde/config/kdesktoprc $(DESTDIR)$(kdeconfigdir)/kdesktoprc
160   - $(INSTALL_DATA) kde/config/kdesurc $(DESTDIR)$(kdeconfigdir)/kdesurc
161   - $(INSTALL_DATA) kde/config/kglobalshortcutsrc $(DESTDIR)$(kdeconfigdir)/kglobalshortcutsrc
162   - $(INSTALL_DATA) kde/config/kickoffrc $(DESTDIR)$(kdeconfigdir)/kickoffrc
163   - $(INSTALL_DATA) kde/config/kmilodrc $(DESTDIR)$(kdeconfigdir)/kmilodrc
164   - $(INSTALL_DATA) kde/config/kmixrc $(DESTDIR)$(kdeconfigdir)/kmixrc
165   - $(INSTALL_DATA) kde/config/konsolerc $(DESTDIR)$(kdeconfigdir)/konsolerc
166   - $(INSTALL_DATA) kde/config/kwalletrc $(DESTDIR)$(kdeconfigdir)/kwalletrc
167   - $(INSTALL_DATA) kde/config/kwinrc $(DESTDIR)$(kdeconfigdir)/kwinrc
168   - $(INSTALL_DATA) kde/config/nepomukserverrc $(DESTDIR)$(kdeconfigdir)/nepomukserverrc
169   - $(INSTALL_DATA) kde/config/oxygenrc $(DESTDIR)$(kdeconfigdir)/oxygenrc
170   - $(INSTALL_DATA) kde/config/plasma-desktop-appletsrc $(DESTDIR)$(kdeconfigdir)/plasma-desktop-appletsrc
171   - $(INSTALL_DATA) kde/config/plasma-desktoprc $(DESTDIR)$(kdeconfigdir)/plasma-desktoprc
172   - $(INSTALL_DATA) kde/config/powerdevilrc $(DESTDIR)$(kdeconfigdir)/powerdevilrc
  165 + $(INSTALL_DATA) kde/config/kdesktoprc $(DESTDIR)$(kde5configdir)/kdesktoprc
  166 + $(INSTALL_DATA) kde/config/kdesurc $(DESTDIR)$(kde5configdir)/kdesurc
  167 + $(INSTALL_DATA) kde/config/kglobalshortcutsrc $(DESTDIR)$(kde5configdir)/kglobalshortcutsrc
  168 + $(INSTALL_DATA) kde/config/kickoffrc $(DESTDIR)$(kde5configdir)/kickoffrc
  169 + $(INSTALL_DATA) kde/config/kmilodrc $(DESTDIR)$(kde5configdir)/kmilodrc
  170 + $(INSTALL_DATA) kde/config/kmixrc $(DESTDIR)$(kde5configdir)/kmixrc
  171 + $(INSTALL_DATA) kde/config/konsolerc $(DESTDIR)$(kde5configdir)/konsolerc
  172 + $(INSTALL_DATA) kde/config/kwalletrc $(DESTDIR)$(kde5configdir)/kwalletrc
  173 + $(INSTALL_DATA) kde/config/kwinrc $(DESTDIR)$(kde5configdir)/kwinrc
  174 + $(INSTALL_DATA) kde/config/nepomukserverrc $(DESTDIR)$(kde5configdir)/nepomukserverrc
  175 + $(INSTALL_DATA) kde/config/oxygenrc $(DESTDIR)$(kde5configdir)/oxygenrc
  176 + $(INSTALL_DATA) kde/config/plasma-desktop-appletsrc $(DESTDIR)$(kde5configdir)/plasma-desktop-appletsrc
  177 + $(INSTALL_DATA) kde/config/plasma-desktoprc $(DESTDIR)$(kde5configdir)/plasma-desktoprc
  178 + $(INSTALL_DATA) kde/config/powerdevilrc $(DESTDIR)$(kde5configdir)/powerdevilrc
173 179 cp -a kde/wallpapers/{$(WALLPAPERS)} $(DESTDIR)$(kdewallpapersdir)
174 180 cp -a kde/desktoptheme $(DESTDIR)$(kdeappsdir)/
175 181 $(INSTALL_SCRIPT) bin/kickoffcfg $(DESTDIR)$(kdebindir)/kickoffcfg
... ... @@ -194,8 +200,7 @@
194 200 done
195 201  
196 202 install: $(pck_infiles:.in=) \
197   - install-kde-distro-addons \
198   - install-icons
  203 + install-kde-distro-addons
199 204  
200 205 dist: clean
201 206 @git log > ChangeLog.git