--- src/usr.bin/make/arch.c	2005/03/03 18:22:58	1.39
+++ src/usr.bin/make/arch.c	2005/03/19 00:19:55	1.40
@@ -188,11 +188,7 @@ Arch_ParseArchive(char **linePtr, Lst *n
 
 	*cp++ = '\0';
 	if (subLibName) {
-		Buffer	*buf;
-
-		buf = Var_Subst(NULL, libName, ctxt, TRUE);
-		libName = Buf_GetAll(buf, NULL);
-		Buf_Destroy(buf, FALSE);
+		libName = Buf_Peel(Var_Subst(NULL, libName, ctxt, TRUE));
 	}
 
 	for (;;) {
@@ -290,7 +286,7 @@ Arch_ParseArchive(char **linePtr, Lst *n
 			 * nodeLst we're returning.
 			 */
 			buf1 = Var_Subst(NULL, memName, ctxt, TRUE);
-			memName = Buf_GetAll(buf1, NULL);
+			memName = Buf_Data(buf1);
 
 			sz = strlen(memName) + strlen(libName) + 3;
 			buf = emalloc(sz);