From e23939d83735236f3ebded9b268bf04abd61de23 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 21 Feb 1996 15:11:54 +0000 Subject: [PATCH] add root dir to doc dir CVS patchset: 374 CVS date: 1996/02/21 15:11:54 --- build/build.c | 1 + build/spec.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/build/build.c b/build/build.c index 73c727e..77ad063 100644 --- a/build/build.c +++ b/build/build.c @@ -66,6 +66,7 @@ struct Script *openScript(Spec spec, int builddir, char *name) fprintf(script->file, "RPM_BUILD_DIR=\"%s\"\n", getVar(RPMVAR_BUILDDIR)); fprintf(script->file, "RPM_DOC_DIR=\"%s\"\n", getVar(RPMVAR_DOCDIR)); fprintf(script->file, "RPM_OPT_FLAGS=\"%s\"\n", getVar(RPMVAR_OPTFLAGS)); + fprintf(script->file, "RPM_ROOT_DIR=\"%s\"\n", getVar(RPMVAR_ROOT)); fprintf(script->file, "RPM_PACKAGE_NAME=\"%s\"\n", spec->name); getEntry(main_package->header, RPMTAG_VERSION, &foo, (void **)&s, &foo); diff --git a/build/spec.c b/build/spec.c index 5eab526..8f59250 100644 --- a/build/spec.c +++ b/build/spec.c @@ -571,7 +571,7 @@ Spec parseSpec(FILE *f, char *specfile) sb = newStringBuf(); reset_spec(); /* Reset the parser */ - appendLineStringBuf(spec->doc, "DOCDIR=$RPM_DOC_DIR/" + appendLineStringBuf(spec->doc, "DOCDIR=$RPM_ROOT_DIR/$RPM_DOC_DIR/" "$RPM_PACKAGE_NAME-$RPM_PACKAGE_VERSION" "-$RPM_PACKAGE_RELEASE"); appendLineStringBuf(spec->doc, "rm -rf $DOCDIR"); -- 2.7.4