mirror of
https://github.com/opnsense/src.git
synced 2026-07-14 19:51:17 -04:00
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.
This commit is contained in:
parent
cf7979fba5
commit
dc3c30d9be
2 changed files with 6 additions and 28 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in a new issue