diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2017-02-10 00:47:32 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-02-10 00:47:32 +0100 |
| commit | 0a7df07702c6f56b708a22c666077a3b90c7542c (patch) | |
| tree | 760707ab65b4e2ab39ac744d740af03f854dd9b0 /nx-libs.spec | |
| parent | 0a314adfa63669155299c77e479ed68c349643bd (diff) | |
| parent | 99c130f153b88fb9c779b0fd1f91d78cc4e75d01 (diff) | |
| download | nx-libs-0a7df07702c6f56b708a22c666077a3b90c7542c.tar.gz nx-libs-0a7df07702c6f56b708a22c666077a3b90c7542c.tar.bz2 nx-libs-0a7df07702c6f56b708a22c666077a3b90c7542c.zip | |
Merge branch 'sunweaver-pr/use-rpath-for-nxagent' into 3.6.x
Attributes GH PR #313: https://github.com/ArcticaProject/nx-libs/pull/313
Diffstat (limited to 'nx-libs.spec')
| -rw-r--r-- | nx-libs.spec | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nx-libs.spec b/nx-libs.spec index 8fb25bf07..4779885da 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -346,7 +346,7 @@ chmod a+x my_configure; export SHLIBGLOBALSFLAGS="%{__global_ldflags}" export LOCAL_LDFLAGS="%{__global_ldflags}" export CDEBUGFLAGS="%{__global_cppflags} %{__global_cflags}" -make %{?_smp_mflags} CONFIGURE="$PWD/my_configure" PREFIX=%{_prefix} LIBDIR=%{_libdir} SHLIBDIR=%{_libdir} +make %{?_smp_mflags} CONFIGURE="$PWD/my_configure" PREFIX=%{_prefix} LIBDIR=%{_libdir} %install make install \ @@ -515,8 +515,8 @@ rm -r %{buildroot}%{_includedir}/nx-X11/Xtrans %{_bindir}/nxagent %dir %{_libdir}/nx/bin %{_libdir}/nx/bin/nxagent -%dir %{_libdir}/nx-X11 -%{_libdir}/nx-X11/libX11.so* +%dir %{_libdir}/nx/X11 +%{_libdir}/nx/X11/libX11.so* %{_datadir}/pixmaps/nxagent.xpm %dir %{_datadir}/nx %{_datadir}/nx/rgb |