diff options
| author | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2016-02-09 02:26:22 +0100 |
|---|---|---|
| committer | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2016-02-09 02:26:22 +0100 |
| commit | 567d8417e81ae89ab5225a866da69e0b9ace399a (patch) | |
| tree | 742511e1bd325a364d5225c68f643adbf9f61220 /debian/rules | |
| parent | 0973cb0c1e889358e155f2ad4241264a50231606 (diff) | |
CMake: use GNUInstallDirs with native multi-arch support
We can now use CMAKE_INSTALL_*DIR instead of defining them manually. Also disable networkarea region plugin build by default. (bzr r4068.2.1)
Diffstat (limited to 'debian/rules')
| -rwxr-xr-x | debian/rules | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/debian/rules b/debian/rules index 559781196..5f4d89837 100755 --- a/debian/rules +++ b/debian/rules @@ -23,7 +23,7 @@ NUX_ABIVERSION := $(shell sed -rn 's/^\#define[[:space:]]+NUX_ABIVERSION[[:space LIBUNITY_PRIVATE := $(shell pkg-config --libs-only-L unity-protocol-private | sed -e 's/-L\(.*\)/\1/' ) SCOPES_RECOMMENDS := $(shell perl debian/scopes-recommends-generator /usr/share/unity/client-scopes.json) -cmake_base_options := -DUSE_GSETTINGS=TRUE -DCOMPIZ_BUILD_WITH_RPATH=FALSE -DCOMPIZ_PACKAGING_ENABLED=TRUE -DCMAKE_SYSCONFDIR=/etc -DCOMPIZ_PLUGIN_INSTALL_TYPE=package +cmake_base_options := -DUSE_GSETTINGS=TRUE -DCOMPIZ_BUILD_WITH_RPATH=FALSE -DCOMPIZ_PACKAGING_ENABLED=TRUE -DCOMPIZ_PLUGIN_INSTALL_TYPE=package ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures))) cmake_gl_options := -DBUILD_GLES=TRUE -DDISABLE_MAINTAINER_CFLAGS=ON endif @@ -39,12 +39,7 @@ override_dh_install: done; \ cd $(CURDIR) find debian/tmp/usr/lib -name \*.*a -exec rm {} \; - rm -f debian/tmp/usr/share/compiz/networkarearegion.xml - rm -f debian/tmp//usr/lib/compiz/libnetworkarearegion.so - rm -rf debian/tmp/usr/share/gconf/schemas/ - mkdir -p debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH) - mv debian/tmp/usr/lib/lib*so* debian/tmp/usr/lib/pkgconfig \ - debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH) + rm -rf debian/tmp/usr/share/gconf/schemas dh_install --fail-missing override_dh_gencontrol: |
