pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk/flavor/pkg audit-packages logic for its location de...
details: https://anonhg.NetBSD.org/pkgsrc/rev/95a8f67548fe
branches: trunk
changeset: 536493:95a8f67548fe
user: adrianp <adrianp%pkgsrc.org@localhost>
date: Sun Dec 16 01:49:08 2007 +0000
description:
audit-packages logic for its location depends on a variety of factors
including OS, pkg_install version and NetBSD version. The following
should pick the correct version to run.
diffstat:
mk/flavor/pkg/flavor-vars.mk | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diffs (34 lines):
diff -r 43d334624a9f -r 95a8f67548fe mk/flavor/pkg/flavor-vars.mk
--- a/mk/flavor/pkg/flavor-vars.mk Sun Dec 16 00:08:27 2007 +0000
+++ b/mk/flavor/pkg/flavor-vars.mk Sun Dec 16 01:49:08 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: flavor-vars.mk,v 1.4 2007/08/02 18:19:32 joerg Exp $
+# $NetBSD: flavor-vars.mk,v 1.5 2007/12/16 01:49:08 adrianp Exp $
#
# This Makefile fragment is included indirectly by bsd.prefs.mk and
# defines some variables which must be defined earlier than where
@@ -40,6 +40,24 @@
MAKEFLAGS+= PKGTOOLS_VERSION=${PKGTOOLS_VERSION}
.endif
+# audit-packages logic for its location depends on a variety of factors
+# including OS, pkg_install version and NetBSD version. The following
+# should pick the correct version to run.
+#
+.if defined(OPSYS) && ${OPSYS} != "NetBSD"
+AP?= ${PKG_TOOLS_BIN}/audit-packages
+.else
+. if exists(${LOCALBASE}/sbin/audit-packages)
+AP?= ${LOCALBASE}/sbin/audit-packages
+. else
+. if exists(/usr/sbin/audit-packages)
+AP?= /usr/sbin/audit-packages
+. else
+AP?= audit-packages
+. endif
+. endif
+.endif
+
# The binary pkg_install tools all need to consistently to refer to the
# correct package database directory.
#
Home |
Main Index |
Thread Index |
Old Index