diff options
| author | bde <bde@FreeBSD.org> | 1995-02-02 17:44:02 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1995-02-02 17:44:02 +0000 |
| commit | 14f499e5c7fecbf865b600cbcf9a9813c52f19ee (patch) | |
| tree | d69af48f60d05d684434c03b364ca0267180c106 /gnu/usr.bin/groff | |
| parent | ca74ab01a7c9f19cc7dad1728da43ac49e0a116d (diff) | |
| download | FreeBSD-src-14f499e5c7fecbf865b600cbcf9a9813c52f19ee.zip FreeBSD-src-14f499e5c7fecbf865b600cbcf9a9813c52f19ee.tar.gz | |
Look for files to install first in the object directory, then in the
source directory.
Don't create target directories at install time. mtree already handles
them correctly.
Diffstat (limited to 'gnu/usr.bin/groff')
| -rw-r--r-- | gnu/usr.bin/groff/Makefile.dev | 17 | ||||
| -rw-r--r-- | gnu/usr.bin/groff/font/Makefile.dev | 17 |
2 files changed, 6 insertions, 28 deletions
diff --git a/gnu/usr.bin/groff/Makefile.dev b/gnu/usr.bin/groff/Makefile.dev index 0df1d80..4f6948f 100644 --- a/gnu/usr.bin/groff/Makefile.dev +++ b/gnu/usr.bin/groff/Makefile.dev @@ -20,20 +20,9 @@ maninstall: .if !target(install) install: - -if test ! -d $(DESTDIR)$(DEVICEDIR); then \ - mkdir $(DESTDIR)$(DEVICEDIR); \ - chown $(BINOWN).$(BINGRP) $(DESTDIR)$(DEVICEDIR); \ - chmod 755 $(DESTDIR)$(DEVICEDIR); \ - fi - -if test -d $(.CURDIR)/generate; then \ - if test ! -d $(DESTDIR)$(DEVICEDIR)/generate; then \ - mkdir $(DESTDIR)$(DEVICEDIR)/generate; \ - chown $(BINOWN).$(BINGRP) $(DESTDIR)$(DEVICEDIR)/generate; \ - chmod 755 $(DESTDIR)$(DEVICEDIR)/generate; \ - fi; \ - fi - -for f in $(FONTFILES); do \ - install -c -o $(FONTOWN) -g $(FONTGRP) -m $(FONTMODE) $$f \ + for f in $(FONTFILES); do \ + ff=$$f; test -f $$f || ff=${.CURDIR}/$$f || true; \ + install -c -o $(FONTOWN) -g $(FONTGRP) -m $(FONTMODE) $$ff \ $(DESTDIR)$(DEVICEDIR)/$$f; \ done .endif diff --git a/gnu/usr.bin/groff/font/Makefile.dev b/gnu/usr.bin/groff/font/Makefile.dev index 0df1d80..4f6948f 100644 --- a/gnu/usr.bin/groff/font/Makefile.dev +++ b/gnu/usr.bin/groff/font/Makefile.dev @@ -20,20 +20,9 @@ maninstall: .if !target(install) install: - -if test ! -d $(DESTDIR)$(DEVICEDIR); then \ - mkdir $(DESTDIR)$(DEVICEDIR); \ - chown $(BINOWN).$(BINGRP) $(DESTDIR)$(DEVICEDIR); \ - chmod 755 $(DESTDIR)$(DEVICEDIR); \ - fi - -if test -d $(.CURDIR)/generate; then \ - if test ! -d $(DESTDIR)$(DEVICEDIR)/generate; then \ - mkdir $(DESTDIR)$(DEVICEDIR)/generate; \ - chown $(BINOWN).$(BINGRP) $(DESTDIR)$(DEVICEDIR)/generate; \ - chmod 755 $(DESTDIR)$(DEVICEDIR)/generate; \ - fi; \ - fi - -for f in $(FONTFILES); do \ - install -c -o $(FONTOWN) -g $(FONTGRP) -m $(FONTMODE) $$f \ + for f in $(FONTFILES); do \ + ff=$$f; test -f $$f || ff=${.CURDIR}/$$f || true; \ + install -c -o $(FONTOWN) -g $(FONTGRP) -m $(FONTMODE) $$ff \ $(DESTDIR)$(DEVICEDIR)/$$f; \ done .endif |
