diff --git a/libyui-bindings.spec b/libyui-bindings.spec index 51c9cdb..2a1edfd 100644 --- a/libyui-bindings.spec +++ b/libyui-bindings.spec @@ -54,7 +54,8 @@ Authors: %setup -q -n libyui-%{version} %build -export LD_LIBRARY_PATH=%{_libdir}:$LD_LIBRARY_PATH +export CFLAGS="-L%{_libdir}" +export CXXFLAGS="-L%{_libdir}" pushd %{name} mkdir build cd build diff --git a/libyui-ncurses-pkg.spec b/libyui-ncurses-pkg.spec index f3a2fe4..a7c16fd 100644 --- a/libyui-ncurses-pkg.spec +++ b/libyui-ncurses-pkg.spec @@ -88,9 +88,8 @@ package selector component for libyui. %setup -q -n libyui-%{version} %build -export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" -export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" -export LD_LIBRARY_PATH=%{_libdir}:$LD_LIBRARY_PATH +export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG -L%{_libdir}" +export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG -L%{_libdir}" pushd %{name} mkdir build diff --git a/libyui-ncurses-rest-api.spec b/libyui-ncurses-rest-api.spec index 4e778f3..64e5b51 100644 --- a/libyui-ncurses-rest-api.spec +++ b/libyui-ncurses-rest-api.spec @@ -81,9 +81,8 @@ extensions for it. %setup -q -n libyui-%{version} %build -export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" -export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" -export LD_LIBRARY_PATH=%{_libdir}:$LD_LIBRARY_PATH +export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG -L%{_libdir}" +export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG -L%{_libdir}" pushd %{name} mkdir build diff --git a/libyui-ncurses.spec b/libyui-ncurses.spec index 073510e..3fe56c3 100644 --- a/libyui-ncurses.spec +++ b/libyui-ncurses.spec @@ -91,9 +91,8 @@ libyui-terminal - useful for testing on headless machines %setup -q -n libyui-%{version} %build -export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" -export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" -export LD_LIBRARY_PATH=%{_libdir}:$LD_LIBRARY_PATH +export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG -L%{_libdir}" +export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG -L%{_libdir}" pushd %{name} mkdir build cd build diff --git a/libyui-qt-graph.spec b/libyui-qt-graph.spec index 8bb8b5b..49bcd01 100644 --- a/libyui-qt-graph.spec +++ b/libyui-qt-graph.spec @@ -80,9 +80,9 @@ for libyui. %setup -q -n libyui-%{version} %build -export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" -export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" -export LD_LIBRARY_PATH=%{_libdir}:$LD_LIBRARY_PATH +export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG -L%{_libdir}" +export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG -L%{_libdir}" + pushd %{name} mkdir build diff --git a/libyui-qt-pkg.spec b/libyui-qt-pkg.spec index 2760d5e..bc22d23 100644 --- a/libyui-qt-pkg.spec +++ b/libyui-qt-pkg.spec @@ -94,10 +94,8 @@ This package has very few dependencies. %setup -q -n libyui-%{version} %build -export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" -export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" -export LD_LIBRARY_PATH=%{_libdir}:$LD_LIBRARY_PATH - +export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG -L%{_libdir}" +export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG -L%{_libdir}" pushd %{name} mkdir build cd build diff --git a/libyui-qt-rest-api.spec b/libyui-qt-rest-api.spec index 41b0fa3..1f12669 100644 --- a/libyui-qt-rest-api.spec +++ b/libyui-qt-rest-api.spec @@ -87,9 +87,8 @@ extensions for it. %setup -q -n libyui-%{version} %build -export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" -export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" -export LD_LIBRARY_PATH=%{_libdir}:$LD_LIBRARY_PATH +export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG -L%{_libdir}" +export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG -L%{_libdir}" pushd %{name} mkdir build diff --git a/libyui-qt.spec b/libyui-qt.spec index 71bd0ef..54efb5d 100644 --- a/libyui-qt.spec +++ b/libyui-qt.spec @@ -81,9 +81,8 @@ only to develop extensions for libyui-qt. %setup -q -n libyui-%{version} %build -export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" -export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" -export LD_LIBRARY_PATH=%{_libdir}:$LD_LIBRARY_PATH +export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG -L%{_libdir}" +export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG -L%{_libdir}" pushd %{name} mkdir build cd build diff --git a/libyui-rest-api.spec b/libyui-rest-api.spec index 1467963..450b8a5 100644 --- a/libyui-rest-api.spec +++ b/libyui-rest-api.spec @@ -79,9 +79,8 @@ pushd %{name} mkdir build cd build -export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG $(getconf LFS_CFLAGS)" -export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG $(getconf LFS_CFLAGS)" -export LD_LIBRARY_PATH=%{_libdir}:$LD_LIBRARY_PATH +export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG $(getconf LFS_CFLAGS) -L%{_libdir}" +export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG $(getconf LFS_CFLAGS) -L%{_libdir}" %if %{?_with_debug:1}%{!?_with_debug:0} CMAKE_OPTS="-DCMAKE_BUILD_TYPE=RELWITHDEBINFO"