summaryrefslogtreecommitdiff
path: root/build
diff options
context:
space:
mode:
authorjbj <devnull@localhost>2005-07-15 15:08:34 +0000
committerjbj <devnull@localhost>2005-07-15 15:08:34 +0000
commitc1afde7db586b58ad8e1ccf8d3825130f3babf14 (patch)
treec3e8eafe37dcb627fca69ae0a21b32f6957df142 /build
parente7cb28cfe725d47aa64dcb6bf41b878b139dbd99 (diff)
downloadlibrpm-tizen-c1afde7db586b58ad8e1ccf8d3825130f3babf14.tar.gz
librpm-tizen-c1afde7db586b58ad8e1ccf8d3825130f3babf14.tar.bz2
librpm-tizen-c1afde7db586b58ad8e1ccf8d3825130f3babf14.zip
- permit scriptlet includes from builddir for spec files w/o %setup.
CVS patchset: 7889 CVS date: 2005/07/15 15:08:34
Diffstat (limited to 'build')
-rw-r--r--build/pack.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/build/pack.c b/build/pack.c
index f02d2ee2b..dfccc7ebb 100644
--- a/build/pack.c
+++ b/build/pack.c
@@ -138,8 +138,7 @@ static /*@only@*/ /*@null@*/ StringBuf addFileToTagAux(Spec spec,
FILE * f;
FD_t fd;
- /* XXX use rpmGenPath(rootdir, "%{_buildir}/%{_buildsubdir}/", file) */
- fn = rpmGetPath("%{_builddir}/", spec->buildSubdir, "/", file, NULL);
+ fn = rpmGetPath("%{_builddir}/%{?_buildsubdir:%{_buildsubdir}/}", file, NULL);
fd = Fopen(fn, "r.ufdio");
if (fn != buf) fn = _free(fn);