X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/blobdiff_plain/e7301710295260c13931dfdef95b966cb402c716..bdd68a4503870aee97f7d03bb7023726daf71a3f:/Makefile

diff --git a/Makefile b/Makefile
index 04fd281662..c0fb30099b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 #	@(#)Makefile	5.1.1.2 (Berkeley) 5/9/91
 #
-#	$Id: Makefile,v 1.32 1994/01/11 08:06:49 rgrimes Exp $
+#	$Id: Makefile,v 1.38 1994/02/04 21:38:47 rgrimes Exp $
 #
 
 SUBDIR=
@@ -66,7 +66,6 @@ world:	directories cleandist mk includes libraries tools mdec
 	@echo "--------------------------------------------------------------"
 	@echo
 	make depend all install
-	cd ${.CURDIR}/usr.sbin/sendmail/src;	make install
 	cd ${.CURDIR}/share/man;		make makedb
 
 directories:
@@ -78,7 +77,12 @@ cleandist:
 	@echo " Cleaning up the source tree, and rebuilding the obj tree"
 	@echo "--------------------------------------------------------------"
 	@echo
-	here=`pwd`; dest=/usr/obj/`echo $$here | sed 's,/usr/src,,'`; \
+	here=`pwd`; dest=/usr/obj`echo $$here | sed 's,^/usr/src,,'`; \
+	if test -d /usr/obj -a ! -d $$dest; then \
+		mkdir -p $$dest; \
+	else \
+		true; \
+	fi;
 	cd $$dest; rm -rf ${SUBDIR}
 	find . -name obj | xargs -n30 rm -rf
 .if defined(MAKE_LOCAL) & exists(local) & exists(local/Makefile)
@@ -117,9 +121,8 @@ includes:
 	chmod 755 ${DESTDIR}/usr/include
 .endif
 	cd ${.CURDIR}/include;			make install
-	cd ${.CURDIR}/gnu/gcc2/libobjc;		make beforeinstall
-	cd ${.CURDIR}/gnu/libg++;		make beforeinstall
-	cd ${.CURDIR}/gnu/libregex;		make beforeinstall
+	cd ${.CURDIR}/gnu/usr.bin/cc/libobjc;	make beforeinstall
+	cd ${.CURDIR}/gnu/lib/libg++;		make beforeinstall
 	cd ${.CURDIR}/lib/libcurses;		make beforeinstall
 	cd ${.CURDIR}/lib/libc;			make beforeinstall
 
@@ -137,13 +140,13 @@ bootstrapld:	directories cleandist mk includes
 	cd ${.CURDIR}/usr.bin/nm;	make -DNOPIC depend all install ${CLEANDIR} obj
 	cd ${.CURDIR}/usr.bin/ranlib;	make -DNOPIC depend all install ${CLEANDIR} obj
 	cd ${.CURDIR}/usr.bin/strip;	make -DNOPIC depend all install ${CLEANDIR} obj
-	cd ${.CURDIR}/gnu/ld;		make -DNOPIC depend all install ${CLEANDIR} obj
-	cd ${.CURDIR}/gnu/gas;		make depend all install ${CLEANDIR} obj
-	cd ${.CURDIR}/gnu/gcc2;		make -DNOPIC depend all install ${CLEANDIR} obj
-	cd ${.CURDIR}/gnu/gcc2/libgcc;	make all install ${CLEANDIR} obj
+	cd ${.CURDIR}/gnu/usr.bin/ld;	make -DNOPIC depend all install ${CLEANDIR} obj
+	cd ${.CURDIR}/gnu/usr.bin/as;	make depend all install ${CLEANDIR} obj
+	cd ${.CURDIR}/gnu/usr.bin/cc;	make -DNOPIC depend all install ${CLEANDIR} obj
+	cd ${.CURDIR}/gnu/usr.bin/cc/libgcc;	make all install ${CLEANDIR} obj
 	cd ${.CURDIR}/lib/csu.i386;	make depend all install ${CLEANDIR} obj
 	cd ${.CURDIR}/lib/libc;		make depend all install ${CLEANDIR} obj
-	cd ${.CURDIR}/gnu/ld/rtld;	make depend all install ${CLEANDIR} obj
+	cd ${.CURDIR}/gnu/usr.bin/ld/rtld;	make depend all install ${CLEANDIR} obj
 
 libraries:
 	# setenv NOPROFILE if you do not want profiled libraries
@@ -154,11 +157,11 @@ libraries:
 .if defined(CLOBBER)
 	find ${DESTDIR}/usr/lib \! -name '*.s[ao].*' -a \! -type d | xargs -n30 rm -rf
 .endif
-	cd ${.CURDIR}/lib;		make depend all install ${CLEANDIR} obj
-	cd ${.CURDIR}/gnu/gcc2/libgcc;	make depend all install ${CLEANDIR} obj
-	cd ${.CURDIR}/gnu/libg++;	make depend all install ${CLEANDIR} obj
-	cd ${.CURDIR}/gnu/libregex;	make depend all install ${CLEANDIR} obj
-	cd ${.CURDIR}/gnu/libmalloc;	make depend all install ${CLEANDIR} obj
+	cd ${.CURDIR}/lib;			make depend all install ${CLEANDIR} obj
+	cd ${.CURDIR}/gnu/usr.bin/cc/libgcc;	make depend all install ${CLEANDIR} obj
+	cd ${.CURDIR}/gnu/lib/libg++;		make depend all install ${CLEANDIR} obj
+	cd ${.CURDIR}/gnu/lib/libregex;		make depend all install ${CLEANDIR} obj
+	cd ${.CURDIR}/gnu/lib/libmalloc;	make depend all install ${CLEANDIR} obj
 	cd ${.CURDIR}/usr.bin/lex;	make depend all install ${CLEANDIR} obj
 
 tools:
@@ -166,7 +169,7 @@ tools:
 	@echo " Rebuilding ${DESTDIR} Compiler and Make"
 	@echo "--------------------------------------------------------------"
 	@echo
-	cd ${.CURDIR}/gnu/gcc2;		make depend all install ${CLEANDIR} obj
+	cd ${.CURDIR}/gnu/usr.bin/cc;	make depend all install ${CLEANDIR} obj
 	cd ${.CURDIR}/usr.bin/make;	make depend all install ${CLEANDIR} obj
 
 mdec: