Fixed RPM spec file and build script.

This commit is contained in:
Matthias Koefferlein 2017-09-10 21:08:56 +00:00
parent 3f417f76bb
commit 1a87dcb807
2 changed files with 6 additions and 1 deletions

View File

@ -473,7 +473,7 @@ fi
$QMAKE -v $QMAKE -v
# Force a minimum rebuild because of version info # Force a minimum rebuild because of version info
touch src/version/version.h touch $CURR_DIR/src/version/version.h
qmake_cmd="$QMAKE $CURR_DIR/src/klayout.pro -recursive \ qmake_cmd="$QMAKE $CURR_DIR/src/klayout.pro -recursive \
CONFIG+=$CONFIG \ CONFIG+=$CONFIG \

View File

@ -75,7 +75,12 @@ elif which qmake-qt5; then
fi fi
# TODO: remove -without-qtbinding # TODO: remove -without-qtbinding
%if "%{git_source}" != ""
# build from git sources if possible
cd %{git_source}
%else
cd %{_sourcedir} cd %{_sourcedir}
%endif
./build.sh -rpath %{_libdir}/klayout \ ./build.sh -rpath %{_libdir}/klayout \
-bin %{_builddir}/bin.$TARGET \ -bin %{_builddir}/bin.$TARGET \
-build %{_builddir}/build.$TARGET \ -build %{_builddir}/build.$TARGET \