summaryrefslogtreecommitdiff
path: root/pkgtools
diff options
context:
space:
mode:
authorjoerg <joerg>2009-02-12 22:23:06 +0000
committerjoerg <joerg>2009-02-12 22:23:06 +0000
commit246593fc8d2d6c44d26ca19dc2f9e5784bb6e5ab (patch)
treeaa7293f5fede549d7423e2223572e4910b1659d3 /pkgtools
parentc494ed4156b052f3a8af4c4c99559d15fc17a92f (diff)
downloadpkgsrc-246593fc8d2d6c44d26ca19dc2f9e5784bb6e5ab.tar.gz
Fix setting of PKG_METADATA_DIR.
Diffstat (limited to 'pkgtools')
-rw-r--r--pkgtools/pkg_install/files/delete/perform.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgtools/pkg_install/files/delete/perform.c b/pkgtools/pkg_install/files/delete/perform.c
index 58ec8e0e3b3..626b9ee2dfd 100644
--- a/pkgtools/pkg_install/files/delete/perform.c
+++ b/pkgtools/pkg_install/files/delete/perform.c
@@ -1,4 +1,4 @@
-/* $NetBSD: perform.c,v 1.25 2009/02/02 12:35:01 joerg Exp $ */
+/* $NetBSD: perform.c,v 1.26 2009/02/12 22:23:06 joerg Exp $ */
#if HAVE_CONFIG_H
#include "config.h"
@@ -7,7 +7,7 @@
#if HAVE_SYS_CDEFS_H
#include <sys/cdefs.h>
#endif
-__RCSID("$NetBSD: perform.c,v 1.25 2009/02/02 12:35:01 joerg Exp $");
+__RCSID("$NetBSD: perform.c,v 1.26 2009/02/12 22:23:06 joerg Exp $");
/*
* FreeBSD install - a package for the installation and maintainance
@@ -79,7 +79,6 @@ static int require_delete(int);
static void require_print(void);
static int undepend(const char *, void *);
-static char LogDir[MaxPathSize];
static char linebuf[MaxPathSize];
static package_t Plist;
@@ -705,7 +704,9 @@ pkg_do(char *pkg)
if (Destdir != NULL)
setenv(PKG_DESTDIR_VNAME, Destdir, 1);
setenv(PKG_PREFIX_VNAME, p->name, 1);
- setenv(PKG_METADATA_DIR_VNAME, LogDir, 1);
+ fname = xasprintf("%s/%s", _pkgdb_getPKGDB_DIR(), pkg);
+ setenv(PKG_METADATA_DIR_VNAME, fname, 1);
+ free(fname);
/*
* Ensure that we don't do VIEW-DEINSTALL action for old packages
* or for the package in its depot directory.