fedora rpmbuild ok
This commit is contained in:
+3
-2
@@ -4,6 +4,7 @@ prefix = @prefix@
|
||||
exec_prefix = @exec_prefix@
|
||||
|
||||
bindir = @bindir@
|
||||
libdir = @libdir@
|
||||
datadir = @datadir@
|
||||
datarootdir = @datarootdir@
|
||||
mandir = @mandir@
|
||||
@@ -77,7 +78,7 @@ maintainer-clean: distclean
|
||||
# override the computed defaults.
|
||||
install: all
|
||||
DESTDIR=${DESTDIR} bindir=${bindir} datadir=${datadir} \
|
||||
mandir=${mandir} \
|
||||
/bin/sh ./recollinstall ${prefix}
|
||||
libdir=${libdir} mandir=${mandir} \
|
||||
/bin/sh ./recollinstall ${prefix}
|
||||
|
||||
.PHONY: all static clean distclean install
|
||||
|
||||
@@ -1837,22 +1837,22 @@ initrecoll(void)
|
||||
|
||||
if (PyType_Ready(&recoll_DbType) < 0)
|
||||
return;
|
||||
Py_INCREF(&recoll_DbType);
|
||||
Py_INCREF((PyObject*)&recoll_DbType);
|
||||
PyModule_AddObject(m, "Db", (PyObject *)&recoll_DbType);
|
||||
|
||||
if (PyType_Ready(&recoll_QueryType) < 0)
|
||||
return;
|
||||
Py_INCREF(&recoll_QueryType);
|
||||
Py_INCREF((PyObject*)&recoll_QueryType);
|
||||
PyModule_AddObject(m, "Query", (PyObject *)&recoll_QueryType);
|
||||
|
||||
if (PyType_Ready(&recoll_DocType) < 0)
|
||||
return;
|
||||
Py_INCREF(&recoll_DocType);
|
||||
Py_INCREF((PyObject*)&recoll_DocType);
|
||||
PyModule_AddObject(m, "Doc", (PyObject *)&recoll_DocType);
|
||||
|
||||
if (PyType_Ready(&recoll_SearchDataType) < 0)
|
||||
return;
|
||||
Py_INCREF(&recoll_SearchDataType);
|
||||
Py_INCREF((PyObject*)&recoll_SearchDataType);
|
||||
PyModule_AddObject(m, "SearchData", (PyObject *)&recoll_SearchDataType);
|
||||
PyModule_AddStringConstant(m, "__doc__",
|
||||
pyrecoll_doc_string);
|
||||
|
||||
@@ -40,6 +40,7 @@ ROOTFORPYTHON=""
|
||||
if test -n "$DESTDIR" ; then
|
||||
PREFIX=$DESTDIR/$PREFIX
|
||||
bindir=$DESTDIR/$bindir
|
||||
libdir=$DESTDIR/$libdir
|
||||
datadir=$DESTDIR/$datadir
|
||||
mandir=$DESTDIR/$mandir
|
||||
ROOTFORPYTHON="--root=${DESTDIR}"
|
||||
@@ -67,6 +68,7 @@ test -x $TESTPROG || fatal "$TESTPROG does not exist." \
|
||||
|
||||
for d in \
|
||||
${bindir} \
|
||||
${libdir} \
|
||||
${mandir}/man1 \
|
||||
${mandir}/man5 \
|
||||
${datadir}/icons \
|
||||
|
||||
Reference in New Issue
Block a user