*** old/src/share/mk/bsd.subdir_ports.mk	Tue Feb 22 01:33:08 1994
--- new/src/share/mk/bsd.subdir_ports.mk	Mon May 16 09:28:19 1994
***************
*** 1,4 ****
! # bsd.subdir_ports.mk	Thu Feb 17 17:26:04 MEZ 1994	by Julian Stacey <jhs@
  #	Copyright Julian Stacey, Munich Dec. 93, Free Software, No Liability.
  #	For details see `Legalities' in /sys/Makefile.
  
--- 1,4 ----
! # bsd.subdir_ports.mk	94 04 26	Julian Stacey <jhs@
  #	Copyright Julian Stacey, Munich Dec. 93, Free Software, No Liability.
  #	For details see `Legalities' in /sys/Makefile.
  
***************
*** 41,75 ****
  #	else happens inside the sub shell invoked by the ( ),
  #	it has thus been omitted to assist shell interpreter speed.
  
- MFLAGS	+= -i	# to be removed when ports tree error free
- #	used to be MFLAGS ?= -i but something was always defining
- #	MFLAGS, so -i was never seen.
- GMAKE		= gmake
- MAKE		?= make
- MAKE_CMD	= ${MAKE} ${MFLAGS}
- GMAKE_CMD	= ${GMAKE} ${MFLAGS}
- AVOID		?= "AVOID set in bsd.subdir_ports.mk avoids broken packages."
- 
- # Define WAIT_OK if you are prepared for the make to hang
- # on an open window awaiting a response.
- 
- # You cant win with DESTDIR, once all packages use DESTDIR, no problem,
- # till then its a 4 way choice between throwing all stuff in
- #	- ${DESTDIR}/usr/local,
- #	- ${DESTDIR}/usr/gnu,
- #	- ${DESTDIR}/
- #	- wherever the package Makefile thinks it wants to put it.
- .if defined(DESTDIR)
- DESTDIR := ${DESTDIR}/usr/local
- .else
- DESTDIR	= /usr/local
- .endif
- 
- BINDIR?= ${DESTDIR}/bin
- # maybe BINDIR & DESTDIR interfere on some packages
- LIBDIR?= ${DESTDIR}/lib
- # maybe useful to have a default LIBDIR ?
- 
  # Labels _SUBDIRUSE & ${SUBDIR} supercede labels in bsd.subdir.mk,
  
  DIR_EXIST = -e
--- 41,46 ----
***************
*** 171,184 ****
  
  .include <bsd.subdir.mk>
  
! .if !target(pkg)
! pkg: _SUBDIRUSE
  .endif
  
  .if !target(world)
  world: _SUBDIRUSE
  # note if we append `all' after `_SUBDIRUSE'
  # then with several levels of SUBDIR makes, we'd get far too many `make all's
  .endif
  
  # End Of File
--- 142,178 ----
  
  .include <bsd.subdir.mk>
  
! .if !target(package)
! package: _SUBDIRUSE
! .endif
! 
! .if !target(packages)
! packages: _SUBDIRUSE
! .endif
! 
! .if !target(install.man)
! install.man: _SUBDIRUSE
  .endif
  
  .if !target(world)
  world: _SUBDIRUSE
  # note if we append `all' after `_SUBDIRUSE'
  # then with several levels of SUBDIR makes, we'd get far too many `make all's
+ .endif
+ 
+ .if !target(show)
+ show:
+ 	@echo  "SUBDIR:		|${SUBDIR}|"
+ 	@echo  "G_SUBDIR:	|${G_SUBDIR}|"
+ 	@echo  "AVOID:		|${AVOID}|"
+ 	@echo  "WAIT_OK:	|${WAIT_OK}|"
+ 	@echo  "MAKE:		|${MAKE}|"
+ 	@echo  "GMAKE:		|${GMAKE}|"
+ 	@echo  "MFLAGS:		|${MFLAGS}|"
+ 	@echo  "DESTDIR:	|${DESTDIR}|"
+ 	@echo  "DESTDIR:	|${DESTDIR}|"
+ 	@echo  "BINDIR:		|${BINDIR}|"
+ 	@echo  "LIBDIR:		|${LIBDIR}|"
  .endif
  
  # End Of File