summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjmz <jmz@FreeBSD.org>2001-10-08 20:02:22 +0000
committerjmz <jmz@FreeBSD.org>2001-10-08 20:02:22 +0000
commit893b534cb899f23953262f63e33f2f657ed6d757 (patch)
tree9f7475d6c2ed302f1da128515419de5a170786c0
parent385750f9ac99576526c31fabc7647f219beb6f07 (diff)
downloadFreeBSD-ports-893b534cb899f23953262f63e33f2f657ed6d757.zip
FreeBSD-ports-893b534cb899f23953262f63e33f2f657ed6d757.tar.gz
Set PREFIX so that pkg-install works well when the port is not installed in
/usr/local/. Submitted by: Mike Meyer <mwm@mired.org>
-rw-r--r--x11/xloadimage/Makefile2
-rw-r--r--x11/xloadimage/pkg-install2
2 files changed, 2 insertions, 2 deletions
diff --git a/x11/xloadimage/Makefile b/x11/xloadimage/Makefile
index f5603c2..0c05fc1 100644
--- a/x11/xloadimage/Makefile
+++ b/x11/xloadimage/Makefile
@@ -54,6 +54,6 @@ do-install:
${PREFIX}/share/examples/xloadimage/xloadimagerc
post-install:
- @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+ @PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.include <bsd.port.mk>
diff --git a/x11/xloadimage/pkg-install b/x11/xloadimage/pkg-install
index f6ed2ea..8f59a7a 100644
--- a/x11/xloadimage/pkg-install
+++ b/x11/xloadimage/pkg-install
@@ -6,7 +6,7 @@
#
set -e
PATH=/bin:/usr/bin:/sbin:/usr/sbin
-PREFIX=${PKG_PREFIX:-/usr/local}
+PREFIX=${PREFIX:-${PKG_PREFIX:-/usr/local}}
CONFIG_FILE=${PREFIX}/etc/xloadimagerc
SAMPLE_CONFIG_DIR=${PREFIX}/share/examples/xloadimage
OpenPOWER on IntegriCloud