diff options
Diffstat (limited to 'contrib/packages/deb')
| -rw-r--r-- | contrib/packages/deb/ubuntu-bionic/debian/rules | 14 | ||||
| -rw-r--r-- | contrib/packages/deb/ubuntu-xenial/debian/rules | 15 |
2 files changed, 12 insertions, 17 deletions
diff --git a/contrib/packages/deb/ubuntu-bionic/debian/rules b/contrib/packages/deb/ubuntu-bionic/debian/rules index 57e8e0ae..e9bb8e87 100644 --- a/contrib/packages/deb/ubuntu-bionic/debian/rules +++ b/contrib/packages/deb/ubuntu-bionic/debian/rules @@ -57,9 +57,8 @@ config-stamp: xorg-source-stamp cmake -G"Unix Makefiles" \ -DBUILD_STATIC=off \ -DCMAKE_INSTALL_PREFIX:PATH=/usr \ - -DSYSCONF_DIR:PATH=/etc \ - -DLIBEXEC_DIR:PATH=/usr/lib/$(DEB_HOST_MULTIARCH) \ - -DUNIT_DIR:PATH=/lib/systemd/system + -DCMAKE_INSTALL_LIBEXECDIR:PATH=lib/$(DEB_HOST_MULTIARCH) \ + -DCMAKE_INSTALL_UNITDIR:PATH=/lib/systemd/system (cd unix/xserver; \ export PIXMANINCDIR=/usr/include/pixman-1; \ autoreconf -fiv; \ @@ -211,15 +210,14 @@ install: build #(cd java; make install DESTDIR=$(CURDIR)/debian/tigervnc-java/usr/share) # install additional license files mkdir -p $(CURDIR)/debian/xtigervncviewer/usr/share/doc/xtigervncviewer - cp $(CURDIR)/debian/tigervncserver/usr/share/doc/tigervnc-*/* \ + cp $(CURDIR)/debian/tigervncserver/usr/share/doc/tigervnc/* \ $(CURDIR)/debian/xtigervncviewer/usr/share/doc/xtigervncviewer/ #mkdir -p $(CURDIR)/debian/tigervnc-java/usr/share/doc/tigervnc-java - #cp $(CURDIR)/debian/tigervncserver/usr/share/doc/tigervnc-*/* \ + #cp $(CURDIR)/debian/tigervncserver/usr/share/doc/tigervnc/* \ #$(CURDIR)/debian/tigervnc-java/usr/share/doc/tigervnc-java/ mkdir -p $(CURDIR)/debian/tigervncserver/usr/share/doc/tigervncserver - mv $(CURDIR)/debian/tigervncserver/usr/share/doc/tigervnc-*/* \ - $(CURDIR)/debian/tigervncserver/usr/share/doc/tigervncserver/ - rm -rf $(CURDIR)/debian/tigervncserver/usr/share/doc/tigervnc-*/ + mv $(CURDIR)/debian/tigervncserver/usr/share/doc/tigervnc \ + $(CURDIR)/debian/tigervncserver/usr/share/doc/tigervncserver # dh_movefiles sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' \ debian/tigervncserver.postinst.in > debian/tigervncserver.postinst diff --git a/contrib/packages/deb/ubuntu-xenial/debian/rules b/contrib/packages/deb/ubuntu-xenial/debian/rules index 28af8d1e..f61099c0 100644 --- a/contrib/packages/deb/ubuntu-xenial/debian/rules +++ b/contrib/packages/deb/ubuntu-xenial/debian/rules @@ -58,9 +58,8 @@ config-stamp: xorg-source-stamp cmake -G"Unix Makefiles" \ -DBUILD_STATIC=off \ -DCMAKE_INSTALL_PREFIX:PATH=/usr \ - -DSYSCONF_DIR:PATH=/etc \ - -DLIBEXEC_DIR:PATH=/usr/lib/$(DEB_HOST_MULTIARCH) \ - -DUNIT_DIR:PATH=/lib/systemd/system + -DCMAKE_INSTALL_LIBEXECDIR:PATH=lib/$(DEB_HOST_MULTIARCH) \ + -DCMAKE_INSTALL_UNITDIR:PATH=/lib/systemd/system (cd unix/xserver; \ export PIXMANINCDIR=/usr/include/pixman-1; \ autoreconf -fiv; \ @@ -212,15 +211,13 @@ install: build #(cd java; make install DESTDIR=$(CURDIR)/debian/tigervnc-java/usr/share) # install additional license files mkdir -p $(CURDIR)/debian/xtigervncviewer/usr/share/doc/xtigervncviewer - cp $(CURDIR)/debian/tigervncserver/usr/share/doc/tigervnc-*/* \ + cp $(CURDIR)/debian/tigervncserver/usr/share/doc/tigervnc/* \ $(CURDIR)/debian/xtigervncviewer/usr/share/doc/xtigervncviewer/ #mkdir -p $(CURDIR)/debian/tigervnc-java/usr/share/doc/tigervnc-java - #cp $(CURDIR)/debian/tigervncserver/usr/share/doc/tigervnc-*/* \ + #cp $(CURDIR)/debian/tigervncserver/usr/share/doc/tigervnc/* \ #$(CURDIR)/debian/tigervnc-java/usr/share/doc/tigervnc-java/ - mkdir -p $(CURDIR)/debian/tigervncserver/usr/share/doc/tigervncserver - mv $(CURDIR)/debian/tigervncserver/usr/share/doc/tigervnc-*/* \ - $(CURDIR)/debian/tigervncserver/usr/share/doc/tigervncserver/ - rm -rf $(CURDIR)/debian/tigervncserver/usr/share/doc/tigervnc-*/ + mv $(CURDIR)/debian/tigervncserver/usr/share/doc/tigervnc \ + $(CURDIR)/debian/tigervncserver/usr/share/doc/tigervncserver # dh_movefiles sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' \ debian/tigervncserver.postinst.in > debian/tigervncserver.postinst |