From a6b81cd9f60fe5241462868bc3718c502743b53f Mon Sep 17 00:00:00 2001
From: George Boudreau <georgeb@linuxfromscratch.org>
Date: Mon, 27 Mar 2006 17:35:46 +0000
Subject: [PATCH] Change xxx-Makefile to Makefile, remove psmisc hack.

---
 BLFS/config    | 2 +-
 CLFS/config    | 2 +-
 CLFS/master.sh | 3 ---
 HLFS/config    | 2 +-
 LFS/config     | 2 +-
 master.sh      | 4 ++--
 6 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/BLFS/config b/BLFS/config
index 6887e96..5bf002f 100644
--- a/BLFS/config
+++ b/BLFS/config
@@ -29,5 +29,5 @@ TEST=0
 
 #--- Default stylesheet
    XSL=blfs.xsl
-MKFILE=$JHALFSDIR/blfs-Makefile
+MKFILE=$JHALFSDIR/Makefile
 
diff --git a/CLFS/config b/CLFS/config
index 8e5cc9f..c2c4ef0 100644
--- a/CLFS/config
+++ b/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
diff --git a/CLFS/master.sh b/CLFS/master.sh
index c21aa1f..80f4c03 100755
--- a/CLFS/master.sh
+++ b/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
diff --git a/HLFS/config b/HLFS/config
index bd0145e..1de2a4e 100644
--- a/HLFS/config
+++ b/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
diff --git a/LFS/config b/LFS/config
index 62935e3..54c0d64 100644
--- a/LFS/config
+++ b/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
diff --git a/master.sh b/master.sh
index 0452f21..a2f997d 100755
--- a/master.sh
+++ b/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"