diff options
author | Pierre Ossman <ossman@cendio.se> | 2019-02-01 13:24:20 +0100 |
---|---|---|
committer | Pierre Ossman <ossman@cendio.se> | 2020-03-12 12:03:52 +0100 |
commit | e4f253e1d1e1851bce3ea4a5511622696daf6d06 (patch) | |
tree | f1fee3aaf1feca1c040f2fc8fcf31a8310d023ba /contrib/packages/rpm | |
parent | 7694f9b4aae475a7b5985e0e960e21c5869f64cf (diff) | |
download | tigervnc-e4f253e1d1e1851bce3ea4a5511622696daf6d06.tar.gz tigervnc-e4f253e1d1e1851bce3ea4a5511622696daf6d06.zip |
Use standard install dir variable names
This makes our builds directly compatible with most distributions
without packagers/users having to specify extra flags.
Diffstat (limited to 'contrib/packages/rpm')
-rw-r--r-- | contrib/packages/rpm/el7/SPECS/tigervnc.spec | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/contrib/packages/rpm/el7/SPECS/tigervnc.spec b/contrib/packages/rpm/el7/SPECS/tigervnc.spec index c6c34d49..46081ce0 100644 --- a/contrib/packages/rpm/el7/SPECS/tigervnc.spec +++ b/contrib/packages/rpm/el7/SPECS/tigervnc.spec @@ -151,10 +151,11 @@ export CPPFLAGS="$CXXFLAGS" export CMAKE_EXE_LINKER_FLAGS=$LDFLAGS +# The cmake in RHEL is too old and doesn't set up +# CMAKE_INSTALL_SYSCONFDIR properly %{cmake} -G"Unix Makefiles" \ - -DBUILD_STATIC=off \ - -DCMAKE_INSTALL_PREFIX=%{_prefix} \ - -DSYSCONF_DIR=%{_sysconfdir} + -DCMAKE_INSTALL_SYSCONFDIR:PATH=%{_sysconfdir} \ + -DBUILD_STATIC=off make %{?_smp_mflags} pushd unix/xserver @@ -248,7 +249,7 @@ fi %files -f %{name}.lang %defattr(-,root,root,-) -%doc %{_docdir}/%{name}-%{version}/README.rst +%doc %{_docdir}/%{name}/README.rst %{_bindir}/vncviewer %{_datadir}/applications/* %{_mandir}/man1/vncviewer.1* @@ -285,7 +286,7 @@ fi %endif %files license -%doc %{_docdir}/%{name}-%{version}/LICENCE.TXT +%doc %{_docdir}/%{name}/LICENCE.TXT %files icons %defattr(-,root,root,-) |