Date: Sat, 27 Feb 2010 11:36:56 +0100 From: Antoine Brodin <antoine@FreeBSD.org> To: Ruslan Ermilov <ru@FreeBSD.org> Cc: svn-src-head@freebsd.org, Antoine Brodin <antoine@freebsd.org>, src-committers@freebsd.org, svn-src-all@freebsd.org Subject: Re: svn commit: r204379 - head/tools/build/mk Message-ID: <20100227113656.a3ea6ad5.antoine@FreeBSD.org> In-Reply-To: <20100227091911.GB47001@edoofus.dev.vega.ru> References: <201002262326.o1QNQFVs084793@svn.freebsd.org> <20100227091911.GB47001@edoofus.dev.vega.ru>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format.
--Multipart=_Sat__27_Feb_2010_11_36_56_+0100_Y8X=WAEW2li2xQXT
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Ruslan Ermilov <ru@FreeBSD.org> wrote:
> Picking up a random context... This doesn't handle the NO_MANCOMPRESS
> case where manpages are installed uncompressed.
What about the following patch.
Index: Makefile.inc1
===================================================================
RCS file: /home/ncvs/src/Makefile.inc1,v
retrieving revision 1.640
diff -u -r1.640 Makefile.inc1
--- Makefile.inc1 26 Jan 2010 10:00:26 -0000 1.640
+++ Makefile.inc1 27 Feb 2010 10:27:35 -0000
@@ -1259,7 +1259,7 @@
@echo ">>> Removing old files (only deletes safe to delete libs)"
# Ask for every old file if the user really wants to remove it.
# It's annoying, but better safe than sorry.
- @for file in ${OLD_FILES}; do \
+ @for file in ${OLD_FILES} ${OLD_FILES:Musr/share/*man/*.gz:R}; do \
if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \
chflags noschg "${DESTDIR}/$${file}" 2>/dev/null || true; \
rm ${RM_I} "${DESTDIR}/$${file}"; \
@@ -1279,7 +1279,7 @@
check-old-files:
@echo ">>> Checking for old files"
- @for file in ${OLD_FILES}; do \
+ @for file in ${OLD_FILES} ${OLD_FILES:Musr/share/*man/*.gz:R}; do \
if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \
echo "${DESTDIR}/$${file}"; \
fi; \
Cheers,
Antoine
--Multipart=_Sat__27_Feb_2010_11_36_56_+0100_Y8X=WAEW2li2xQXT
Content-Type: text/x-diff;
name="M.diff"
Content-Disposition: attachment;
filename="M.diff"
Content-Transfer-Encoding: 7bit
Index: Makefile.inc1
===================================================================
RCS file: /home/ncvs/src/Makefile.inc1,v
retrieving revision 1.640
diff -u -r1.640 Makefile.inc1
--- Makefile.inc1 26 Jan 2010 10:00:26 -0000 1.640
+++ Makefile.inc1 27 Feb 2010 10:27:35 -0000
@@ -1259,7 +1259,7 @@
@echo ">>> Removing old files (only deletes safe to delete libs)"
# Ask for every old file if the user really wants to remove it.
# It's annoying, but better safe than sorry.
- @for file in ${OLD_FILES}; do \
+ @for file in ${OLD_FILES} ${OLD_FILES:Musr/share/*man/*.gz:R}; do \
if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \
chflags noschg "${DESTDIR}/$${file}" 2>/dev/null || true; \
rm ${RM_I} "${DESTDIR}/$${file}"; \
@@ -1279,7 +1279,7 @@
check-old-files:
@echo ">>> Checking for old files"
- @for file in ${OLD_FILES}; do \
+ @for file in ${OLD_FILES} ${OLD_FILES:Musr/share/*man/*.gz:R}; do \
if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \
echo "${DESTDIR}/$${file}"; \
fi; \
--Multipart=_Sat__27_Feb_2010_11_36_56_+0100_Y8X=WAEW2li2xQXT--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20100227113656.a3ea6ad5.antoine>