Move scripts in /etc/xprofile.d to /etc/profile.d

This commit is contained in:
Silvan Calarco 2016-05-19 00:29:30 +02:00
parent 7e2099106f
commit 17a2a7bcee
2 changed files with 3 additions and 5 deletions

View File

@ -1,5 +1,5 @@
# Makefile for desktop-base-openmamba package # Makefile for desktop-base-openmamba package
# Copyright (C) 2004-2015 by Silvan Calarco <silvan.calarco@mambasoft.it> # Copyright (C) 2004-2016 by Silvan Calarco <silvan.calarco@mambasoft.it>
# Copyright (C) 2005-2007 by Davide Madrisan <davide.madrisan@gmail.com> # Copyright (C) 2005-2007 by Davide Madrisan <davide.madrisan@gmail.com>
include VERSION include VERSION
@ -48,7 +48,7 @@ endif
initrddir = ${sysconfdir}/rc.d/init.d initrddir = ${sysconfdir}/rc.d/init.d
mandir = ${prefix}/usr/share/man mandir = ${prefix}/usr/share/man
sysconfigdir= ${sysconfdir}/sysconfig sysconfigdir= ${sysconfdir}/sysconfig
xprofiledir = ${sysconfdir}/xprofile.d profiledir = ${sysconfdir}/profile.d
mambabasedatadir = ${datadir}/openmamba/mambabase mambabasedatadir = ${datadir}/openmamba/mambabase
mambareportdatadir = ${datadir}/openmamba/mambareport mambareportdatadir = ${datadir}/openmamba/mambareport
mambaimagesdir = ${datadir}/openmamba/images mambaimagesdir = ${datadir}/openmamba/images
@ -155,10 +155,8 @@ install-kde-distro-addons: dist-update
cp -r etc/profile.d $(DESTDIR)$(sysconfdir)/ cp -r etc/profile.d $(DESTDIR)$(sysconfdir)/
cp -r etc/sudoers.d $(DESTDIR)$(sysconfdir)/ cp -r etc/sudoers.d $(DESTDIR)$(sysconfdir)/
cp -r etc/sysconfig $(DESTDIR)$(sysconfdir)/ cp -r etc/sysconfig $(DESTDIR)$(sysconfdir)/
cp -r etc/xprofile.d $(DESTDIR)$(sysconfdir)/
cp etc/system-sleep/* $(DESTDIR)$(systemdsleepdir)/ cp etc/system-sleep/* $(DESTDIR)$(systemdsleepdir)/
chmod 755 $(DESTDIR)$(sysconfdir)/profile.d/*.sh chmod 755 $(DESTDIR)$(sysconfdir)/profile.d/*.sh
chmod 755 $(DESTDIR)$(sysconfdir)/xprofile.d/*.sh
$(INSTALL_SCRIPT) kde/scripts/showlog $(DESTDIR)$(distrobindir) $(INSTALL_SCRIPT) kde/scripts/showlog $(DESTDIR)$(distrobindir)
cp -r menu/icons/ $(DESTDIR)$(datadir)/icons/ cp -r menu/icons/ $(DESTDIR)$(datadir)/icons/
@ -231,7 +229,7 @@ install-xramdr:
install-desktop: install-desktop:
@$(INSTALL_DIR) $(DESTDIR)$(distrodesktopdir) @$(INSTALL_DIR) $(DESTDIR)$(distrodesktopdir)
$(INSTALL_DATA) $(pck_desktop) $(DESTDIR)$(distrodesktopdir) $(INSTALL_DATA) $(pck_desktop) $(DESTDIR)$(distrodesktopdir)
$(INSTALL_SCRIPT) desktop/desktop-firsttime.sh $(DESTDIR)$(xprofiledir) $(INSTALL_SCRIPT) desktop/desktop-firsttime.sh $(DESTDIR)$(profiledir)
install-openmamba-update: install-openmamba-update:
@$(INSTALL_DIR) $(DESTDIR)$(bindir) @$(INSTALL_DIR) $(DESTDIR)$(bindir)