mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pkg/deb: install libraries to lib

Browse Source 
Recent cmake versions (starting with 3.0) don't use multiarch
libdir when the install prefix is not /usr. To have the same library
directory for all packages explicitly set CMAKE_INSTALL_LIBDIR to lib.
This commit is contained in:
Bernhard Miklautz 2015-01-22 01:35:38 +01:00
parent 05f2872520
commit 8c4e4364cd
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packaging/deb/freerdp-nightly/freerdp-nightly-dev.install
View File

@ -1,2 +1,4 @@
opt/freerdp-nightly/lib opt/freerdp-nightly/lib/*.so
opt/freerdp-nightly/lib/pkgconfig
opt/freerdp-nightly/lib/cmake
opt/freerdp-nightly/include opt/freerdp-nightly/include

2
packaging/deb/freerdp-nightly/freerdp-nightly.install
View File

@ -1,3 +1,3 @@
opt/freerdp-nightly/lib opt/freerdp-nightly/lib/*.so.*
opt/freerdp-nightly/bin opt/freerdp-nightly/bin
opt/freerdp-nightly/share/man/man1/xfreerdp.1* opt/freerdp-nightly/share/man/man1/xfreerdp.1*

8
packaging/deb/freerdp-nightly/rules
View File

@ -24,7 +24,8 @@ DEB_CMAKE_EXTRA_FLAGS := -DCMAKE_SKIP_RPATH=FALSE \
-DBUILD_TESTING=OFF \ -DBUILD_TESTING=OFF \
-DCMAKE_BUILD_TYPE=RELWITHDEBINFO \ -DCMAKE_BUILD_TYPE=RELWITHDEBINFO \
-DCMAKE_INSTALL_PREFIX=/opt/freerdp-nightly/ \ -DCMAKE_INSTALL_PREFIX=/opt/freerdp-nightly/ \
-DCMAKE_INSTALL_INCLUDEDIR=include/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH) \ -DCMAKE_INSTALL_INCLUDEDIR=include \
-DCMAKE_INSTALL_LIBDIR=lib \
$(ARM_FLOAT_ABI) \ $(ARM_FLOAT_ABI) \
$(NULL) $(NULL)
@ -35,19 +36,16 @@ override_dh_auto_configure:
dh_auto_configure -- $(DEB_CMAKE_EXTRA_FLAGS) dh_auto_configure -- $(DEB_CMAKE_EXTRA_FLAGS)
override_dh_shlibdeps: override_dh_shlibdeps:
dh_shlibdeps -l /opt/freerdp-nightly/lib/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)/ dh_shlibdeps -l /opt/freerdp-nightly/lib/
override_dh_strip: override_dh_strip:
dh_strip --dbg-package=freerdp-nightly-dbg dh_strip --dbg-package=freerdp-nightly-dbg
override_dh_install: override_dh_install:
rm -f debian/tmp/opt/freerdp-nightly/lib/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)/libwinpr-makecert-tool.a
rm -f debian/tmp/opt/freerdp-nightly/lib/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)/freerdp/*.a
rm -f debian/tmp/opt/freerdp-nightly/lib/libwinpr-makecert-tool.a rm -f debian/tmp/opt/freerdp-nightly/lib/libwinpr-makecert-tool.a
rm -f debian/tmp/opt/freerdp-nightly/lib/freerdp/*.a rm -f debian/tmp/opt/freerdp-nightly/lib/freerdp/*.a
dh_install --fail-missing dh_install --fail-missing
override_dh_clean: override_dh_clean:
rm -f include/version.h
rm -f config.h rm -f config.h
dh_clean dh_clean