diff --git a/Makefile b/Makefile index 06de238..b1d5830 100644 --- a/Makefile +++ b/Makefile @@ -1015,3 +1015,4 @@ calc-unsymlink: ${V} echo '=-=-=-=-= private Makefile $@ rule start =-=-=-=-=' ${Q} ${MAKE} ${XARG} -f ${MAKE_FILE} $@ ${XVAR} ${V} echo '=-=-=-=-= private Makefile $@ rule end =-=-=-=-=' +# DO NOT DELETE diff --git a/Makefile.ship b/Makefile.ship index da7fff6..56f793b 100644 --- a/Makefile.ship +++ b/Makefile.ship @@ -1255,7 +1255,7 @@ LANG= C LDCONFIG= ldconfig LN= ln MAKE= make -MAKEDEPEND= makedepend +MAKEDEPEND= /usr/bin/makedepend MKDIR= mkdir MV= mv PWDCMD= pwd @@ -4202,6 +4202,11 @@ depend: hsrc custom/Makefile else \ ${TRUE}; \ fi + ${Q} if [ ! -x "${MAKEDEPEND}" ]; then \ + echo "makedepend command not found: ${MAKEDEPEND}"; \ + echo "aborting depend rule"; \ + exit 1; \ + fi ${V} echo '=-=-=-=-= Invoking depend rule for cscript =-=-=-=-=' ${Q} cd cscript; ${MAKE} -f Makefile ${CSCRIPT_PASSDOWN} depend ${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-=' diff --git a/custom/Makefile b/custom/Makefile index 4d6cfd7..59502c6 100644 --- a/custom/Makefile +++ b/custom/Makefile @@ -515,7 +515,7 @@ FMT= fmt GREP= egrep LN= ln MAKE= make -MAKEDEPEND= makedepend +MAKEDEPEND= /usr/bin/makedepend MKDIR= mkdir MV= mv RM= rm @@ -1303,6 +1303,11 @@ depend: else \ ${TRUE}; \ fi + ${Q} if [ ! -x "${MAKEDEPEND}" ]; then \ + echo "makedepend command not found: ${MAKEDEPEND}"; \ + echo "aborting depend rule"; \ + exit 1; \ + fi ${Q} echo forming custom/skel ${Q} ${RM} -rf skel ${Q} ${MKDIR} -p skel @@ -1333,7 +1338,7 @@ depend: >> "skel/$$i"; \ echo '#endif /* '"$$tag"' */' >> "skel/$$i"; \ done - ${Q} ${RM} -f skel/custom/makedep.out + ${Q} ${RM} -f skel/custom/makedep.out skel/custom/makedep.in ${Q} echo custom/skel formed ${Q} echo forming custom dependency list ${Q} :> skel/custom/makedep.out @@ -1341,7 +1346,9 @@ depend: -I../../.. -w 1 -f makedep.out -- \ ${CFLAGS} -- \ ${C_SRC} 2>/dev/null - ${Q} ${SED} -e 's|: ../../|: |' -E -i '' -l skel/custom/makedep.out + ${Q} ${CP} -f skel/custom/makedep.out skel/custom/makedep.in + ${Q} ${SED} -e 's|: ../../|: |' -E < skel/custom/makedep.in | \ + ${GREP} -v /usr/include > skel/custom/makedep.out -${Q} for i in ${C_SRC} /dev/null; do \ if [ X"$$i" != X"/dev/null" ]; then \ echo "$$i" | ${SED} 's/^\(.*\)\.c/\1.o: \1.c/'; \ diff --git a/custom/Makefile.head b/custom/Makefile.head index 063acde..6f1e543 100644 --- a/custom/Makefile.head +++ b/custom/Makefile.head @@ -515,7 +515,7 @@ FMT= fmt GREP= egrep LN= ln MAKE= make -MAKEDEPEND= makedepend +MAKEDEPEND= /usr/bin/makedepend MKDIR= mkdir MV= mv RM= rm diff --git a/custom/Makefile.tail b/custom/Makefile.tail index a6163f6..0e94b5c 100644 --- a/custom/Makefile.tail +++ b/custom/Makefile.tail @@ -193,6 +193,11 @@ depend: else \ ${TRUE}; \ fi + ${Q} if [ ! -x "${MAKEDEPEND}" ]; then \ + echo "makedepend command not found: ${MAKEDEPEND}"; \ + echo "aborting depend rule"; \ + exit 1; \ + fi ${Q} echo forming custom/skel ${Q} ${RM} -rf skel ${Q} ${MKDIR} -p skel @@ -223,7 +228,7 @@ depend: >> "skel/$$i"; \ echo '#endif /* '"$$tag"' */' >> "skel/$$i"; \ done - ${Q} ${RM} -f skel/custom/makedep.out + ${Q} ${RM} -f skel/custom/makedep.out skel/custom/makedep.in ${Q} echo custom/skel formed ${Q} echo forming custom dependency list ${Q} :> skel/custom/makedep.out @@ -231,7 +236,9 @@ depend: -I../../.. -w 1 -f makedep.out -- \ ${CFLAGS} -- \ ${C_SRC} 2>/dev/null - ${Q} ${SED} -e 's|: ../../|: |' -E -i '' -l skel/custom/makedep.out + ${Q} ${CP} -f skel/custom/makedep.out skel/custom/makedep.in + ${Q} ${SED} -e 's|: ../../|: |' -E < skel/custom/makedep.in | \ + ${GREP} -v /usr/include > skel/custom/makedep.out -${Q} for i in ${C_SRC} /dev/null; do \ if [ X"$$i" != X"/dev/null" ]; then \ echo "$$i" | ${SED} 's/^\(.*\)\.c/\1.o: \1.c/'; \