diff options
| author | gjb <gjb@FreeBSD.org> | 2016-11-03 00:34:37 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2016-11-03 00:34:37 +0000 |
| commit | fb1704cd33e629a35df3b75fddbf68c437e04168 (patch) | |
| tree | 5f36c20cabfba1a890976f9c3b6172ec8ce771b5 | |
| parent | 61d9404c801a8378fd346252ad42c982bf11bef0 (diff) | |
| download | FreeBSD-src-fb1704cd33e629a35df3b75fddbf68c437e04168.zip FreeBSD-src-fb1704cd33e629a35df3b75fddbf68c437e04168.tar.gz | |
MFC r308148, r308150, r308156:
r308148:
Fix packaging calendar(1) files.
r308150:
Fix packaging /usr/share/examples/etc.
r308156:
Fix packaging /usr/lib{,32}/libgcc_eh{,_p}.a.
Sponsored by: The FreeBSD Foundation
| -rw-r--r-- | etc/Makefile | 2 | ||||
| -rw-r--r-- | gnu/lib/libgcc/Makefile | 4 | ||||
| -rw-r--r-- | share/examples/Makefile | 2 | ||||
| -rw-r--r-- | usr.bin/calendar/Makefile | 10 |
4 files changed, 10 insertions, 8 deletions
diff --git a/etc/Makefile b/etc/Makefile index b41a806..fe518d2 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -459,7 +459,7 @@ distrib-dirs: ${MTREES:N/*} distrib-cleanup .PHONY .endif etc-examples-install: ${META_DEPS} - cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ + cd ${.CURDIR}; ${INSTALL} ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 \ ${BIN1} ${BIN2} nsmb.conf opieaccess \ ${DESTDIR}${SHAREDIR}/examples/etc diff --git a/gnu/lib/libgcc/Makefile b/gnu/lib/libgcc/Makefile index a47bd33..a6d14f9 100644 --- a/gnu/lib/libgcc/Makefile +++ b/gnu/lib/libgcc/Makefile @@ -393,11 +393,11 @@ _libinstall: _lib-eh-install _lib-eh-install: .if ${MK_INSTALLLIB} != "no" - ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ + ${INSTALL} ${TAG_ARGS} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${_INSTALLFLAGS} libgcc_eh.a ${DESTDIR}${LIBDIR} .endif .if ${MK_PROFILE} != "no" - ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ + ${INSTALL} ${TAG_ARGS} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${_INSTALLFLAGS} libgcc_eh_p.a ${DESTDIR}${LIBDIR} .endif diff --git a/share/examples/Makefile b/share/examples/Makefile index acb50c7..7bf606c 100644 --- a/share/examples/Makefile +++ b/share/examples/Makefile @@ -250,7 +250,7 @@ copies: symlinks: .for i in ${LDIRS} rm -rf ${DESTDIR}${BINDIR}/$i - ln -s ${.CURDIR}/$i ${DESTDIR}${BINDIR}/$i + ${INSTALL} ${TAG_ARGS} -l s ${.CURDIR}/$i ${DESTDIR}${BINDIR}/$i .endfor etc-examples: diff --git a/usr.bin/calendar/Makefile b/usr.bin/calendar/Makefile index 5e8ba88..38cf6db 100644 --- a/usr.bin/calendar/Makefile +++ b/usr.bin/calendar/Makefile @@ -15,20 +15,22 @@ FR_LINKS= fr_FR.ISO8859-15 TEXTMODE?= 444 beforeinstall: - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${TEXTMODE} \ + ${INSTALL} ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m ${TEXTMODE} \ ${.CURDIR}/calendars/calendar.* ${DESTDIR}${SHAREDIR}/calendar .for lang in ${INTER} - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${TEXTMODE} \ + ${INSTALL} ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m ${TEXTMODE} \ ${.CURDIR}/calendars/${lang}/calendar.* \ ${DESTDIR}${SHAREDIR}/calendar/${lang} .endfor .for link in ${DE_LINKS} rm -rf ${DESTDIR}${SHAREDIR}/calendar/${link} - ln -s de_DE.ISO8859-1 ${DESTDIR}${SHAREDIR}/calendar/${link} + ${INSTALL} ${TAG_ARGS} -l s de_DE.ISO8859-1 \ + ${DESTDIR}${SHAREDIR}/calendar/${link} .endfor .for link in ${FR_LINKS} rm -rf ${DESTDIR}${SHAREDIR}/calendar/${link} - ln -s fr_FR.ISO8859-1 ${DESTDIR}${SHAREDIR}/calendar/${link} + ${INSTALL} ${TAG_ARGS} -l s fr_FR.ISO8859-1 \ + ${DESTDIR}${SHAREDIR}/calendar/${link} .endfor .if ${MK_TESTS} != "no" |
