diff options
| author |   deraadt <deraadt@openbsd.org> | 1995-12-19 12:14:29 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 1995-12-19 12:14:29 +0000 |
| commit | 25a066f0c7ef757aa3abf4717c67c3067094acee (patch) | |
| tree | e55e91e8f285b7452e7c41a99b68269b7b0558f4 | |
| parent | install processed man pages; from niklas (diff) | |
| download | wireguard-openbsd-25a066f0c7ef757aa3abf4717c67c3067094acee.tar.xz wireguard-openbsd-25a066f0c7ef757aa3abf4717c67c3067094acee.zip | |
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 |