diff options
| author | Marco S Hyman <marc@cvs.openbsd.org> | 1999-04-06 19:14:42 +0000 |
|---|---|---|
| committer | Marco S Hyman <marc@cvs.openbsd.org> | 1999-04-06 19:14:42 +0000 |
| commit | 051071bf59d46c1093c41230013d0190eedcf0f0 (patch) | |
| tree | f2f5950874c08398ea6f8396fae12090c88d7ba4 /share | |
| parent | e558f5499253259cf085adeeabe6f4dd95e98577 (diff) | |
Fix library dependency test for arch-es that don't
suppport shared libs so building tk80, for example, doesn't
cause tkl80 to get built even thouth it
is already installed. Update list-distfiles target
Diffstat (limited to 'share')
| -rw-r--r-- | share/mk/bsd.port.mk | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/share/mk/bsd.port.mk b/share/mk/bsd.port.mk index 793d9be91e9..9e170abe192 100644 --- a/share/mk/bsd.port.mk +++ b/share/mk/bsd.port.mk @@ -1,6 +1,6 @@ #-*- mode: Fundamental; tab-width: 4; -*- # ex:ts=4 -# $OpenBSD: bsd.port.mk,v 1.82 1999/04/02 06:55:56 marc Exp $ +# $OpenBSD: bsd.port.mk,v 1.83 1999/04/06 19:14:41 marc Exp $ # # bsd.port.mk - 940820 Jordan K. Hubbard. # This file is in the public domain. @@ -28,7 +28,7 @@ OpenBSD_MAINTAINER= marc@OpenBSD.ORG # NEED_VERSION: we need at least this version of bsd.port.mk for this # port to build -FULL_REVISION=$$OpenBSD: bsd.port.mk,v 1.82 1999/04/02 06:55:56 marc Exp $$ +FULL_REVISION=$$OpenBSD: bsd.port.mk,v 1.83 1999/04/06 19:14:41 marc Exp $$ .if defined(NEED_VERSION) _VERSION_REVISION=${FULL_REVISION:M[0-9]*.*} @@ -1282,7 +1282,17 @@ mirror-distfiles: # use is make ECHO_MSG=: list-distfiles | tee some-file # list-distfiles: - @for file in ${DISTFILES} ${PATCHFILES}; do ${ECHO} $$file; done + @echo "${PKGNAME}" + @for file in ${DISTFILES} ${PATCHFILES}; do \ + if [ "$$file" != "${EXTRACT_SUFX}" ]; then \ + if [ -z "${DIST_SUBDIR}" ]; then \ + printf "\t$$file\n"; \ + else \ + printf "\t${DIST_SUBDIR}/$$file\n"; \ + fi \ + fi \ + done + @echo "" # Obj # @@ -2061,7 +2071,7 @@ lib-depends: .if !defined(NO_DEPENDS) .if defined(NO_SHARED_LIBS) @for i in ${LIB_DEPENDS}; do \ - lib=`${ECHO} $$i | ${SED} -e 's/:.*//' -e 's|\([^\\]\)\.|\1\\\\.|g'`; \ + lib=`${ECHO} $$i | ${SED} -e 's/:.*//' -e 's|\([^\\]\)[\\\.].*|\1|'`; \ dir=`${ECHO} $$i | ${SED} -e 's/[^:]*://'`; \ if ${EXPR} "$$dir" : '.*:' > /dev/null; then \ target=`${ECHO} $$dir | ${SED} -e 's/.*://'`; \ |