profile.d: Place it to a better directory and install files to their packages.

diff --git a/lfs/bash b/lfs/bash
index cfc9424ee4ae0dc9abe6e631b562fbbbd967d772..fd74dfb920709515beacb280167d19a1228f0f47 100644 (file)
--- a/lfs/bash
+++ b/lfs/bash
@@ -142,7 +142,12 @@ ifeq "$(STAGE)" "base"
        cd $(DIR_APP) && make install
 
        # Bash startup files
-       cp -avf $(DIR_SOURCE)/bash/{bashrc,inputrc,profile,profile.d,shells} /etc
+       cp -avf $(DIR_SOURCE)/bash/{bashrc,inputrc,profile,shells} /etc
+
+       # /etc/profile.d
+       -mkdir -pv /etc/profile.d
+       cp -vf $(DIR_SOURCE)/profile.d/{extrapaths,i18n,readline,umask}.sh \
+               /etc/profile.d
 endif
 
        @rm -rf $(DIR_APP)

diff --git a/lfs/coreutils b/lfs/coreutils
index 9fb2b6f6592d946a6557451b1182dafa7085ba3e..8a03351bbdaa0e68a6283031734879f1f87509bb 100644 (file)
--- a/lfs/coreutils
+++ b/lfs/coreutils
@@ -128,6 +128,8 @@ ifeq "$(STAGE)" "base"
 
        # Dump /etc/dircolors.
        dircolors -p > /etc/dircolors
+       -mkdir -pv /etc/profile.d
+       cp -vf $(DIR_SOURCE)/profile.d/dircolors.sh /etc/profile.d
 
        # PAM
        cp -vf $(DIR_CONFIG)/pam.d/su{,-l} /etc/pam.d

diff --git a/src/bash/profile.d/dircolors.sh b/src/profile.d/dircolors.sh
similarity index 100%
rename from src/bash/profile.d/dircolors.sh
rename to src/profile.d/dircolors.sh

diff --git a/src/bash/profile.d/extrapaths.sh b/src/profile.d/extrapaths.sh
similarity index 100%
rename from src/bash/profile.d/extrapaths.sh
rename to src/profile.d/extrapaths.sh

diff --git a/src/bash/profile.d/i18n.sh b/src/profile.d/i18n.sh
similarity index 100%
rename from src/bash/profile.d/i18n.sh
rename to src/profile.d/i18n.sh

diff --git a/src/bash/profile.d/readline.sh b/src/profile.d/readline.sh
similarity index 100%
rename from src/bash/profile.d/readline.sh
rename to src/profile.d/readline.sh

diff --git a/src/bash/profile.d/umask.sh b/src/profile.d/umask.sh
similarity index 100%
rename from src/bash/profile.d/umask.sh
rename to src/profile.d/umask.sh