My last commit to bsd.port.mk made me think - `pkg_create -p ...' should

override the PLIST file's own first @cwd.  Make this so.

1 files changed, 7 insertions, 5 deletions

diff --git a/usr.sbin/pkg_install/create/perform.c b/usr.sbin/pkg_install/create/perform.c
index 2f2bb5a..27d437d 100644
--- a/usr.sbin/pkg_install/create/perform.c
+++ b/usr.sbin/pkg_install/create/perform.c
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char *rcsid = "$Id: perform.c,v 1.9 1994/05/25 06:24:41 jkh Exp $";
+static const char *rcsid = "$Id: perform.c,v 1.10 1994/08/29 16:31:37 adam Exp $";
 #endif
 
 /*
@@ -62,12 +62,14 @@ pkg_perform(char **pkgs)
     else
 	suffix = "tgz";
 
-    if (Prefix)
-	add_plist(&plist, PLIST_CWD, Prefix);
-
     /* Slurp in the packing list */
     read_plist(&plist, pkg_in);
 
+    /* Prefix should override the packing list */
+    if (Prefix) {
+	delete_plist(&plist, FALSE, PLIST_CWD, NULL);
+	add_plist_top(&plist, PLIST_CWD, Prefix);
+    }
     /*
      * Run down the list and see if we've named it, if not stick in a name
      * at the top.
@@ -76,7 +78,7 @@ pkg_perform(char **pkgs)
 	add_plist_top(&plist, PLIST_NAME, pkg);
 
     /* Make a directory to stomp around in */
-    home = make_playpen(PlayPen);
+    home = make_playpen(PlayPen, 1);
     signal(SIGINT, cleanup);
     signal(SIGHUP, cleanup);