folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add root dir to doc dir 

CVS patchset: 374
CVS date: 1996/02/21 15:11:54
This commit is contained in:
root 1996-02-21 15:11:54 +00:00
parent 7da9a0568f
commit e23939d837
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/build.c
View File

@ -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);

2
build/spec.c
View File

@ -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");