diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1995-12-19 12:14:30 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1995-12-19 12:14:30 +0000 |
| commit | fc79c5b025c738ef39f68daa10100f364c71a6b7 (patch) | |
| tree | 5759ddd4dfb24f80eb7c96e56f6ee01ca1b3a035 | |
| parent | 1dab3fe8e8979ff2c75a39d3333eb8c1940b2ebc (diff) | |
check for Makefile.bsd-wrapper in the correct directory
| -rw-r--r-- | share/mk/bsd.subdir.mk | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/share/mk/bsd.subdir.mk b/share/mk/bsd.subdir.mk index 553aa8d1958..0eebc5a6be6 100644 --- a/share/mk/bsd.subdir.mk +++ b/share/mk/bsd.subdir.mk @@ -18,10 +18,11 @@ _SUBDIRUSE: .USE else \ _nextdir_="$${_THISDIR_}/$${_newdir_}"; \ fi; \ - if [ -f $${_nextdir_}/Makefile.bsd-wrapper ]; then \ - _makefile_spec_="-f Makefile.bsd-wrapper"; \ - fi; \ - echo "===> $${_nextdir_}"; \ + _makefile_spec_=""; \ + if [ -e $${_newdir_}/Makefile.bsd-wrapper ]; then \ + _makefile_spec_="-f Makefile.bsd-wrapper"; \ + fi; \ + echo "===> $${_nextdir_}"; \ cd ${.CURDIR}/$${_newdir_}; \ ${MAKE} $${_makefile_spec_} _THISDIR_="$${_nextdir_}" \ ${.TARGET:S/realinstall/install/:S/.depend/depend/}); \ @@ -33,9 +34,10 @@ ${SUBDIR}:: else \ _newdir_=${.TARGET}; \ fi; \ - if [ -f $${_newdir_}/Makefile.bsd-wrapper ]; then \ - _makefile_spec_="-f Makefile.bsd-wrapper"; \ - fi; \ + _makefile_spec_=""; \ + if [ -f $${_newdir_}/Makefile.bsd-wrapper ]; then \ + _makefile_spec_="-f Makefile.bsd-wrapper"; \ + fi; \ echo "===> $${_newdir_}"; \ cd ${.CURDIR}/$${_newdir_}; \ ${MAKE} $${_makefile_spec_} _THISDIR_="$${_newdir_}" all |