diff options
| author | jlam <jlam> | 2001-07-15 12:40:03 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2001-07-15 12:40:03 +0000 |
| commit | 1e4d55e4bf2338031cc957695c4dedd50bbc0ed7 (patch) | |
| tree | ae5f239e2744c741a9ece087f81f3ad4cc335352 | |
| parent | 6bf761f9c142a52f0ba321516892ded73f86c332 (diff) | |
| download | pkgsrc-1e4d55e4bf2338031cc957695c4dedd50bbc0ed7.tar.gz | |
Rename "FILE" to "FILE_CMD" since ".for FILE" is a common idiom in BSD
makefiles, and this interferes with the conditional definition of FILE
in defs.*.mk.
| -rw-r--r-- | mk/bsd.pkg.mk | 8 | ||||
| -rw-r--r-- | mk/defs.Linux.mk | 4 | ||||
| -rw-r--r-- | mk/defs.NetBSD.mk | 4 | ||||
| -rw-r--r-- | mk/defs.SunOS.mk | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 16e47085a3d..0fcdd6b5776 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.787 2001/07/13 11:28:23 tron Exp $ +# $NetBSD: bsd.pkg.mk,v 1.788 2001/07/15 12:40:03 jlam Exp $ # # This file is in the public domain. # @@ -1732,7 +1732,7 @@ real-su-install: ${MESSAGE} for manpage in $$newmanpages; do \ manpage=`${ECHO} $$manpage | ${SED} -e 's|\.gz$$||'`; \ if [ -h ${PREFIX}/$$manpage.gz ]; then \ - set - `${FILE} ${PREFIX}/$$manpage.gz | ${SED} -e 's|\.gz$$||'`; \ + set - `${FILE_CMD} ${PREFIX}/$$manpage.gz | ${SED} -e 's|\.gz$$||'`; \ shift `expr $$# - 1`; \ ${RM} -f ${PREFIX}/$$manpage; \ ${LN} -s $${1} ${PREFIX}/$$manpage; \ @@ -1751,7 +1751,7 @@ real-su-install: ${MESSAGE} for manpage in $$newmanpages; do \ manpage=`${ECHO} $$manpage | ${SED} -e 's|\.gz$$||'`; \ if [ -h ${PREFIX}/$$manpage ]; then \ - set - `${FILE} ${PREFIX}/$$manpage`; \ + set - `${FILE_CMD} ${PREFIX}/$$manpage`; \ shift `expr $$# - 1`; \ ${RM} -f ${PREFIX}/$$manpage.gz; \ ${LN} -s $${1}.gz ${PREFIX}/$$manpage.gz; \ @@ -1944,7 +1944,7 @@ show-shlib-type: if [ "X${MKPIC}" != "Xno" -a "X${NOPIC}" = "X" ]; then \ ${ECHO} "int main() { exit(0); }" > a.$$$$.c; \ ${CC} ${CFLAGS} a.$$$$.c -o a.$$$$.out; \ - case `${FILE} a.$$$$.out` in \ + case `${FILE_CMD} a.$$$$.out` in \ *ELF*dynamically*) \ sotype=ELF ;; \ *shared*library*) \ diff --git a/mk/defs.Linux.mk b/mk/defs.Linux.mk index 67990b2f734..568dabafde6 100644 --- a/mk/defs.Linux.mk +++ b/mk/defs.Linux.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.Linux.mk,v 1.5 2001/07/13 06:16:02 jlam Exp $ +# $NetBSD: defs.Linux.mk,v 1.6 2001/07/15 12:40:03 jlam Exp $ # # Variable definitions for the Linux operating system. @@ -16,7 +16,7 @@ DIRNAME?= /bin/dirname ECHO?= /bin/echo EGREP?= /bin/egrep FALSE?= /bin/false -FILE?= /usr/bin/file +FILE_CMD?= /usr/bin/file FIND?= /usr/bin/find GREP?= /bin/grep GTAR?= /bin/tar diff --git a/mk/defs.NetBSD.mk b/mk/defs.NetBSD.mk index 4194e5aa9f0..5d7f5c7bb25 100644 --- a/mk/defs.NetBSD.mk +++ b/mk/defs.NetBSD.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.NetBSD.mk,v 1.4 2001/07/13 06:16:02 jlam Exp $ +# $NetBSD: defs.NetBSD.mk,v 1.5 2001/07/15 12:40:03 jlam Exp $ # # Variable definitions for the NetBSD operating system. @@ -16,7 +16,7 @@ DIRNAME?= /usr/bin/dirname ECHO?= echo # Shell builtin EGREP?= /usr/bin/egrep FALSE?= false # Shell builtin -FILE?= /usr/bin/file +FILE_CMD?= /usr/bin/file FIND?= /usr/bin/find GREP?= /usr/bin/grep GTAR?= /usr/bin/tar diff --git a/mk/defs.SunOS.mk b/mk/defs.SunOS.mk index 8a930f25a74..84648c6a077 100644 --- a/mk/defs.SunOS.mk +++ b/mk/defs.SunOS.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.SunOS.mk,v 1.4 2001/07/13 06:16:02 jlam Exp $ +# $NetBSD: defs.SunOS.mk,v 1.5 2001/07/15 12:40:03 jlam Exp $ # # Variable definitions for the SunOS/Solaris operating system. @@ -16,7 +16,7 @@ DIRNAME?= /usr/bin/dirname ECHO?= /usr/ucb/echo EGREP?= /usr/xpg4/bin/egrep FALSE?= /usr/bin/false -FILE?= /usr/bin/file +FILE_CMD?= /usr/bin/file FIND?= /usr/bin/find GREP?= /usr/bin/grep GTAR?= ${ZOULARISBASE}/bin/tar |