added MDEC_OPT for passing options to bootblock compilation.

[unix-history] / Makefile

diff --git a/Makefile b/Makefile
index 0da33b8..5cc4883 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 #      @(#)Makefile    5.1.1.2 (Berkeley) 5/9/91
 #
 #      @(#)Makefile    5.1.1.2 (Berkeley) 5/9/91
 #

-#      $Id: Makefile,v 1.49 1994/05/14 19:45:28 ache Exp $
+#      $Id: Makefile,v 1.53 1994/06/09 13:10:13 ache Exp $

 #
 
 SUBDIR=
 #
 
 SUBDIR=


@@ -67,7 +67,7 @@ CLEANDIR=
 CLEANDIR=      cleandir
 .endif
 
 CLEANDIR=      cleandir
 .endif
 

-# Where is the c-compier source.  Change this, and gnu/usr.bin/Makefile if you
+# Where is the c-compiler source.  Change this, and gnu/usr.bin/Makefile if you

 # want to use another cc (gcc-2.5.8 for instance)
 CCDIR=         ${.CURDIR}/gnu/usr.bin/cc
 #CCDIR=                ${.CURDIR}/gnu/usr.bin/cc25
 # want to use another cc (gcc-2.5.8 for instance)
 CCDIR=         ${.CURDIR}/gnu/usr.bin/cc
 #CCDIR=                ${.CURDIR}/gnu/usr.bin/cc25


@@ -122,7 +122,7 @@ mk:
        # DONT DO THIS!! chown ${BINOWN}.${BINGRP} ${DESTDIR}/usr/share/mk
        # DONT DO THIS!! chmod 755 ${DESTDIR}/usr/share/mk
 .endif
        # DONT DO THIS!! chown ${BINOWN}.${BINGRP} ${DESTDIR}/usr/share/mk
        # DONT DO THIS!! chmod 755 ${DESTDIR}/usr/share/mk
 .endif

-       cd ${.CURDIR}/share/mk;                 make install;
+       cd ${.CURDIR}/share/mk;                 make clean all install;

 
 includes:
        @echo "--------------------------------------------------------------"
 
 includes:
        @echo "--------------------------------------------------------------"


@@ -135,13 +135,14 @@ includes:
        chown ${BINOWN}.${BINGRP} ${DESTDIR}/usr/include
        chmod 755 ${DESTDIR}/usr/include
 .endif
        chown ${BINOWN}.${BINGRP} ${DESTDIR}/usr/include
        chmod 755 ${DESTDIR}/usr/include
 .endif

-       cd ${.CURDIR}/include;                  make install
+       cd ${.CURDIR}/include;                  make clean all install

        cd ${CCDIR}/libobjc;                    make beforeinstall
        cd ${.CURDIR}/gnu/lib/libg++;           make beforeinstall
        cd ${CCDIR}/libobjc;                    make beforeinstall
        cd ${.CURDIR}/gnu/lib/libg++;           make beforeinstall

+       cd ${.CURDIR}/gnu/lib/libreadline;      make beforeinstall

        cd ${.CURDIR}/lib/libcurses;            make beforeinstall
        cd ${.CURDIR}/lib/libc;                 make beforeinstall
 .if !defined(NOCRYPT) && exists(${.CURDIR}/kerberosIV)
        cd ${.CURDIR}/lib/libcurses;            make beforeinstall
        cd ${.CURDIR}/lib/libc;                 make beforeinstall
 .if !defined(NOCRYPT) && exists(${.CURDIR}/kerberosIV)

-       cd ${.CURDIR}/kerberosIV/include;       make install
+       cd ${.CURDIR}/kerberosIV/include;       make clean all install

 .endif
 
 # You MUST run this the first time you get the new sources to boot strap
 .endif
 
 # You MUST run this the first time you get the new sources to boot strap


@@ -223,13 +224,14 @@ tools:
        cd ${CCDIR};                    make depend all install ${CLEANDIR} obj
        cd ${.CURDIR}/usr.bin/make;     make depend all install ${CLEANDIR} obj
 
        cd ${CCDIR};                    make depend all install ${CLEANDIR} obj
        cd ${.CURDIR}/usr.bin/make;     make depend all install ${CLEANDIR} obj
 

+MDEC_OPT?=

 mdec:
        @echo "--------------------------------------------------------------"
        @echo " Rebuilding ${DESTDIR}/usr/mdec"
        @echo "--------------------------------------------------------------"
        @echo
 .if ${MACHINE} == "i386"
 mdec:
        @echo "--------------------------------------------------------------"
        @echo " Rebuilding ${DESTDIR}/usr/mdec"
        @echo "--------------------------------------------------------------"
        @echo
 .if ${MACHINE} == "i386"

-       cd ${.CURDIR}/sys/i386/boot;    make depend all install ${CLEANDIR}
+       cd ${.CURDIR}/sys/i386/boot;    make ${MDEC_OPT} depend all install ${CLEANDIR}

 .if defined (DESTDIR)
        cd /usr/mdec; find . | cpio -pdamuv ${DESTDIR}/usr/mdec
 .endif
 .if defined (DESTDIR)
        cd /usr/mdec; find . | cpio -pdamuv ${DESTDIR}/usr/mdec
 .endif