From ccc52239a799ae5247f0d5de3adacb69d47f973c Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 27 Nov 2015 15:15:03 +0200 Subject: [PATCH] Respect destination directory in "make install". --HG-- branch : develop --- dist/rpm/valentina.spec | 12 +++++++----- dist/valentina.dsc | 6 +++--- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dist/rpm/valentina.spec b/dist/rpm/valentina.spec index 8060c5d1d..96cc3bcef 100644 --- a/dist/rpm/valentina.spec +++ b/dist/rpm/valentina.spec @@ -83,7 +83,9 @@ qmake-qt5 PREFIX=%{buildroot}%{_prefix} Valentina.pro -r CONFIG+=no_ccache %install export NO_DEBUGINFO_STRIP_DEBUG=true -%{__make} install + +%{__make} INSTALL_ROOT=%{buildroot} install + gzip -9c dist/debian/%{name}.1 > dist/debian/%{name}.1.gz && %{__install} -Dm 644 dist/debian/%{name}.1.gz %{buildroot}%{_mandir}/man1/%{name}.1.gz @@ -91,10 +93,10 @@ gzip -9c dist/debian/tape.1 > dist/debian/tape.1.gz && %{__install} -Dm 644 dist/debian/tape.1.gz %{buildroot}%{_mandir}/man1/tape.1.gz cp dist/debian/valentina.sharedmimeinfo dist/debian/%{name}.xml && -%{__install} -Dm 644 dist/debian/%{name}.xml %{_datadir}/mime/packages/%{name}.xml +%{__install} -Dm 644 dist/debian/%{name}.xml %{buildroot}%{_datadir}/mime/packages/%{name}.xml cp dist/debian/valentina.mime dist/debian/%{name} && -%{__install} -Dm 644 dist/debian/%{name} %{_libdir}/mime/packages/%{name} +%{__install} -Dm 644 dist/debian/%{name} %{buildroot}%{_libdir}/mime/packages/%{name} %if 0%{?suse_version} > 0 %suse_update_desktop_file -r %{name} VectorGraphics @@ -150,6 +152,6 @@ rm -f dist/debian/%{name}.1.gz dist/debian/tape.1.gz dist/debian/%{name}.xml dis %changelog -* Mon Dec 22 2014 Roman Telezhinskyi - - Initial build +* Mon Oct 27 2015 Roman Telezhinskyi + - Auto build diff --git a/dist/valentina.dsc b/dist/valentina.dsc index 21a67285c..6144cf2bb 100644 --- a/dist/valentina.dsc +++ b/dist/valentina.dsc @@ -11,8 +11,8 @@ Build-Depends: debhelper (>= 8.0.0), qtbase5-dev (>= 5.0.0), libqt5svg5-dev (>= Package-List: valentina deb graphics optional Checksums-Sha1: - 581eb1bf36b4ab7126b5983d809130f15396859e 24838101 valentina_0.3.3.tar.gz + 581eb1bf36b4ab7126b5983d809130f15396859e 24838101 valentina_0.3.3.tar Checksums-Sha256: - 9b156c7120a69b90373efb8ca9998c3e0563a60ad337210166cfd41b00b0f13c 24838101 valentina_0.3.3.tar.gz + 9b156c7120a69b90373efb8ca9998c3e0563a60ad337210166cfd41b00b0f13c 24838101 valentina_0.3.3.tar Files: - 95677e29d3a59cf5b064f7be236a4b78 24838101 valentina_0.3.3.tar.gz + 95677e29d3a59cf5b064f7be236a4b78 24838101 valentina_0.3.3.tar