Change xxx-Makefile to Makefile, remove psmisc hack.

BLFS/config

@@ -29,5 +29,5 @@ TEST=0
 
 #--- Default stylesheet
    XSL=blfs.xsl
-MKFILE=$JHALFSDIR/blfs-Makefile
+MKFILE=$JHALFSDIR/Makefile
 

CLFS/config

@@ -64,7 +64,7 @@ XSL=clfs.xsl
 
 #--- Book version
 LFSVRS=development
-MKFILE=$JHALFSDIR/clfs-Makefile
+MKFILE=$JHALFSDIR/Makefile
 
 #--- FTP/HTTP mirror used as fallback (full path)
 SERVER=ftp://anduin.linuxfromscratch.org/LFS/conglomeration

CLFS/master.sh

@@ -541,9 +541,6 @@ bm_final_system_Makefiles() { #
     case $this_script in 
       *stripping*) [[ "$STRIP" = "0" ]] && continue
        ;;
-      *psmisc*)   # Build fails on creation of this link. <pidof> installed in sysvinit
-                  sed -e 's/^ln -s/#ln -s/' -i $file
-       ;;
     esac
 
     # First append each name of the script files to a list (this will become

HLFS/config

@@ -35,7 +35,7 @@ XSL=hlfs.xsl
 
 #--- Book version
 LFSVRS=development
-MKFILE=$JHALFSDIR/hlfs-Makefile
+MKFILE=$JHALFSDIR/Makefile
 
 #--- FTP/HTTP mirror used as fallback (full path)
 SERVER=ftp://anduin.linuxfromscratch.org/HLFS/conglomeration

LFS/config

@@ -30,7 +30,7 @@ XSL=lfs.xsl
 LFSVRS=development
 
 #--- Name of the makefile
-MKFILE=$JHALFSDIR/lfs-Makefile
+MKFILE=$JHALFSDIR/Makefile
 
 #--- FTP/HTTP mirror used as fallback (full path)
 SERVER=ftp://anduin.linuxfromscratch.org/LFS/conglomeration

master.sh

@@ -143,7 +143,7 @@ while test $# -gt 0 ; do
       BUILDDIR=$1
       JHALFSDIR=$BUILDDIR/jhalfs
       LOGDIR=$JHALFSDIR/logs
-      MKFILE=$JHALFSDIR/${PROGNAME}-Makefile
+      MKFILE=$JHALFSDIR/Makefile
       ;;
 
    
@@ -187,7 +187,7 @@ while test $# -gt 0 ; do
     --run-make | -M )      RUNMAKE=1 ;;
     --no-strip )           STRIP=0   ;;
     --no-vim-lang )        VIMLANG=0 ;;
-    --rebuild )            CLEAN=1 ;;
+    --rebuild )            CLEAN=1   ;;
 
     --page_size )
       test $# = 1 && eval "$exit_missing_arg"