summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authoragc <agc>1998-10-27 10:35:26 +0000
committeragc <agc>1998-10-27 10:35:26 +0000
commitb88146f3d869eed1ee5942edb300c530d544c7d1 (patch)
tree2bdc8bc461b6f6b148be20cdecc453934230a795 /mk
parent299bd5f4f0a718e88ce1355feb6dfad64d0a2afa (diff)
downloadpkgsrc-b88146f3d869eed1ee5942edb300c530d544c7d1.tar.gz
Now we can be sure of pkg_install tools with the functionality, make
PKG_RELATIVE_SYMLINKS the default (i.e. if any full-pathname symbolic links are encountered by pkg_create(1), adjust them to be relative to ${PREFIX}, if appropriate). This helps with binary packages.
Diffstat (limited to 'mk')
-rw-r--r--mk/bsd.pkg.mk7
-rw-r--r--mk/mk.conf.example9
2 files changed, 3 insertions, 13 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 06f5ba259bb..c4b2578ae05 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.187 1998/10/26 18:29:10 agc Exp $
+# $NetBSD: bsd.pkg.mk,v 1.188 1998/10/27 10:35:26 agc Exp $
#
# This file is in the public domain.
#
@@ -385,15 +385,12 @@ PKG_DELETE?= /usr/sbin/pkg_delete
PKG_INFO?= /usr/sbin/pkg_info
.ifndef PKG_ARGS
-PKG_ARGS= -v -c ${COMMENT} -d ${DESCR} -f ${PLIST}
+PKG_ARGS= -v -c ${COMMENT} -d ${DESCR} -f ${PLIST} -l
PKG_ARGS+= -b ${BUILD_VERSION_FILE} -B ${BUILD_INFO_FILE}
PKG_ARGS+= -p ${PREFIX} -P "`${MAKE} package-depends PACKAGE_DEPENDS_WITH_PATTERNS=true|sort -u`"
.ifdef CONFLICTS
PKG_ARGS+= -C "${CONFLICTS}"
.endif
-.ifdef PKG_RELATIVE_SYMLINKS
-PKG_ARGS+= -l
-.endif
.ifdef INSTALL_FILE
PKG_ARGS+= -i ${INSTALL_FILE}
.endif
diff --git a/mk/mk.conf.example b/mk/mk.conf.example
index 33cacf3693e..60b98035c2c 100644
--- a/mk/mk.conf.example
+++ b/mk/mk.conf.example
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf.example,v 1.32 1998/10/20 16:01:03 agc Exp $
+# $NetBSD: mk.conf.example,v 1.33 1998/10/27 10:35:26 agc Exp $
#
# Sample /etc/mk.conf file, which can be used to set specific values
# for building either NetBSD or some of the NetBSD packages collection.
@@ -174,13 +174,6 @@ PAPERSIZE= A4 # Default paper size for packages.
# Possible: any user name
# Default: pgsql
-#PKG_RELATIVE_SYMLINKS=yes # Change any "absolute" symlinks (i.e. ones
- # containing the full pathname) into relative
- # ones (relative to $PREFIX) when building
- # a package.
- # Possible: defined, not defined
- # Default: not defined
-
#RCS_LOCALID= # Used in cvs-current package for an RCS Id
# which is expanded.
# Possible: anything (within reason)