pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk/extract Forgot to provide the default value for EXT...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/c528aae4e753
branches:  trunk
changeset: 519750:c528aae4e753
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Mon Oct 09 02:37:32 2006 +0000

description:
Forgot to provide the default value for EXTRACT_DIR.

EXTRACT_DIR may be given relative to WRKDIR.

diffstat:

 mk/extract/extract.mk |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (27 lines):

diff -r 64e292d1f7cd -r c528aae4e753 mk/extract/extract.mk
--- a/mk/extract/extract.mk     Mon Oct 09 02:31:57 2006 +0000
+++ b/mk/extract/extract.mk     Mon Oct 09 02:37:32 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: extract.mk,v 1.16 2006/10/09 02:31:57 rillig Exp $
+# $NetBSD: extract.mk,v 1.17 2006/10/09 02:37:32 rillig Exp $
 #
 # The following variables may be set by the package Makefile and
 # specify how extraction happens:
@@ -40,6 +40,8 @@
 #      EXTRACT_OPTS, EXTRACT_USING and EXTRACT_ELEMENTS.
 #
 
+EXTRACT_DIR?=          ${WRKDIR}
+
 _COOKIE.extract=       ${WRKDIR}/.extract_done
 
 ######################################################################
@@ -195,7 +197,7 @@
 .  for __file__ in ${EXTRACT_ONLY}
        ${_PKG_SILENT}${_PKG_DEBUG}                                     \
        extract_file=${_DISTDIR:Q}/${__file__:Q}; export extract_file;  \
-       cd ${EXTRACT_DIR} && ${EXTRACT_CMD}
+       cd ${WRKDIR} && cd ${EXTRACT_DIR} && ${EXTRACT_CMD}
 .  endfor
 .endif
 



Home | Main Index | Thread Index | Old Index