zeroday0619/MahiroOS-jhalfs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Change xxx-Makefile to Makefile, remove psmisc hack.

Browse source
This commit is contained in:
George Boudreau 2006-03-27 17:35:46 +00:00
parent d43a271fa8
commit a6b81cd9f6
6 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
BLFS/config
View file

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

2
CLFS/config
View file

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

3
CLFS/master.sh
View file

@ -541,9 +541,6 @@ bm_final_system_Makefiles() { #
case $this_script in case $this_script in
*stripping*) [[ "$STRIP" = "0" ]] && continue *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 esac
# First append each name of the script files to a list (this will become # First append each name of the script files to a list (this will become

2
HLFS/config
View file

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

2
LFS/config
View file

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

4
master.sh
View file

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