diff options
| -rw-r--r-- | debian/Makefile.nx-libs | 43 | ||||
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/libnx-mesa-extras-dev.install | 6 | ||||
| -rw-r--r-- | debian/nxauth.install | 4 | ||||
| -rw-r--r-- | debian/nxproxy.install | 5 | ||||
| -rwxr-xr-x | debian/roll-tarballs.sh | 1 | ||||
| -rwxr-xr-x | debian/rules | 10 | ||||
| -rw-r--r-- | debian/x2goagent.dirs | 4 | ||||
| -rw-r--r-- | debian/x2goagent.install | 9 | ||||
| -rw-r--r-- | debian/x2goagent.links | 1 |
10 files changed, 64 insertions, 21 deletions
diff --git a/debian/Makefile.nx-libs b/debian/Makefile.nx-libs index 3151be283..d50d69908 100644 --- a/debian/Makefile.nx-libs +++ b/debian/Makefile.nx-libs @@ -1,10 +1,18 @@ #!/usr/bin/make -f +INSTALL_DIR=install -d -m 755 +INSTALL_FILE=install -m 644 +INSTALL_PROGRAM=install -m 755 +RM_FILE=rm -f +RM_DIR=rmdir -p --ignore-fail-on-non-empty + PREFIX ?= /usr/local +BINDIR=$(PREFIX)/bin +NXLIBDIR=$(PREFIX)/lib/nx +X2GOLIBDIR=$(PREFIX)/lib/x2go CONFIGURE=./configure %: - if test -f bin/Makefile; then ${MAKE} -C bin $@; fi if test -f nxcomp/Makefile; then ${MAKE} -C nxcomp $@; fi if test -f nxproxy/Makefile; then ${MAKE} -C nxproxy $@; fi if test -d nx-X11; then \ @@ -37,8 +45,39 @@ build: ${MAKE} build-full; \ fi +install: + $(INSTALL_DIR) $(DESTDIR)$(BINDIR) + for f in nxagent nxauth nxproxy x2goagent; do \ + $(INSTALL_PROGRAM) bin/$$f $(DESTDIR)$(BINDIR); done + for d in nxcomp nxproxy; do \ + $(MAKE) -C $$d install; done + [ ! -d nx-X11 ] || for d in nxcompext nxcompshad; do \ + $(MAKE) -C $$d install; done + $(INSTALL_DIR) $(DESTDIR)$(X2GOLIBDIR)/bin/ + cd $(DESTDIR)$(X2GOLIBDIR)/bin/ && ln -sf ../../nx/bin/nxagent x2goagent + $(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/pixmaps + $(INSTALL_FILE) nx-X11/programs/Xserver/hw/nxagent/x2go.xpm $(DESTDIR)$(PREFIX)/share/pixmaps + $(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/x2go + $(INSTALL_FILE) rgb $(DESTDIR)$(PREFIX)/share/x2go + $(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/x2go/versions + $(INSTALL_FILE) VERSION.x2goagent $(DESTDIR)$(PREFIX)/share/x2go/versions + $(INSTALL_DIR) $(DESTDIR)$(NXLIBDIR)/bin + $(INSTALL_PROGRAM) nx-X11/programs/nxauth/nxauth $(DESTDIR)$(NXLIBDIR)/bin + $(INSTALL_PROGRAM) nxproxy/nxproxy $(DESTDIR)$(NXLIBDIR)/bin + $(INSTALL_DIR) $(DESTDIR)$(PREFIX)/include/nx/extras/Mesa/GL/internal + $(INSTALL_FILE) nx-X11/extras/Mesa/include/GL/*.h \ + $(DESTDIR)$(PREFIX)/include/nx/extras/Mesa/GL/ + $(INSTALL_FILE) nx-X11/extras/Mesa/include/GL/internal/*.h \ + $(DESTDIR)$(PREFIX)/include/nx/extras/Mesa/GL/internal/ + $(INSTALL_DIR) $(DESTDIR)$(PREFIX)/include/nx/extras/Mesa/GLES/ + $(INSTALL_FILE) nx-X11/extras/Mesa/include/GLES/*.h \ + $(DESTDIR)$(PREFIX)/include/nx/extras/Mesa/GLES/ + uninstall: - if test -f bin/Makefile; then ${MAKE} -C bin $@; fi + for f in nxagent nxauth nxproxy x2goagent; do \ + $(RM_FILE) $(DESTDIR)$(BINDIR)/$$f; done + $(RM_FILE) $(DESTDIR)$(X2GOLIBDIR)/bin/x2goagent + $(RM_DIR) $(DESTDIR)$(X2GOLIBDIR)/bin/ if test -f nxcomp/Makefile; then ${MAKE} -C nxcomp $@; fi if test -f nxproxy/Makefile; then ${MAKE} -C nxproxy $@; fi if test -d nx-X11; then \ diff --git a/debian/changelog b/debian/changelog index 9350f134c..335bc7da6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -39,6 +39,8 @@ nx-libs (2:3.5.0.17-0) UNRELEASED; urgency=low * Update 031_nx-X11_parallel-make.full.patch. Add an explicit dependency from the NX libX11.so to the nxcomp libraries. Unbreaks parallel builds. (Fixes: #87). + * Fix and greatly enhance the top-level install and uninstall target for + plain makefile installs. -- Reinhard Tartler <siretart@tauware.de> Sat, 15 Dec 2012 14:29:12 +0100 diff --git a/debian/libnx-mesa-extras-dev.install b/debian/libnx-mesa-extras-dev.install index 7a54b8f52..52fc7bae0 100644 --- a/debian/libnx-mesa-extras-dev.install +++ b/debian/libnx-mesa-extras-dev.install @@ -1,3 +1,3 @@ -nx-X11/extras/Mesa/include/GL/*.h usr/include/nx/extras/Mesa/GL/ -nx-X11/extras/Mesa/include/GL/internal/*.h usr/include/nx/extras/Mesa/GL/internal/ -nx-X11/extras/Mesa/include/GLES/*.h usr/include/nx/extras/Mesa/GLES/ +usr/include/nx/extras/Mesa/GL/ +usr/include/nx/extras/Mesa/GL/internal/ +usr/include/nx/extras/Mesa/GLES/ diff --git a/debian/nxauth.install b/debian/nxauth.install index 94e40356c..9c5db00da 100644 --- a/debian/nxauth.install +++ b/debian/nxauth.install @@ -1,2 +1,2 @@ -nx-X11/programs/nxauth/nxauth usr/lib/nx/bin -bin/nxauth usr/bin +usr/lib/nx/bin/nxauth +usr/bin/nxauth diff --git a/debian/nxproxy.install b/debian/nxproxy.install index 7b2af0fbb..46c2e0a3b 100644 --- a/debian/nxproxy.install +++ b/debian/nxproxy.install @@ -1,3 +1,2 @@ -nxproxy/nxproxy usr/lib/nx/bin -bin/nxproxy usr/bin - +usr/lib/nx/bin/nxproxy +usr/bin/nxproxy diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh index 21171b6b1..b43de4b88 100755 --- a/debian/roll-tarballs.sh +++ b/debian/roll-tarballs.sh @@ -86,6 +86,7 @@ if [ "x$MODE" = "xfull" ]; then cp -v $file doc/applied-patches echo ${file##*/} >> doc/applied-patches/series done + cp -v debian/rgb debian/VERSION.x2goagent . else rm -Rf "nxcompshad"* rm -Rf "nxcompext"* diff --git a/debian/rules b/debian/rules index cbc44ea00..c1f02946d 100755 --- a/debian/rules +++ b/debian/rules @@ -20,10 +20,12 @@ override_dh_clean: rm -f nx*/changelog rm -f nx-X11/programs/Xserver/hw/nxagent/changelog rm -f nx-X11/programs/nxauth/changelog - rm -f Makefile - rm -f bin + rm -f Makefile bin rgb VERSION.x2goagent dh_clean +override_dh_auto_install: + PREFIX=/usr dh_auto_install -Smakefile + override_dh_auto_build: # create copies of upstream changelogs so that names apply to Debian policy... cp -a nx-X11/CHANGELOG nx-X11/changelog @@ -35,10 +37,10 @@ override_dh_auto_build: cp -a nxproxy/CHANGELOG nxproxy/changelog ln -s debian/Makefile.nx-libs Makefile ln -s debian/wrappers bin + ln -s debian/rgb + ln -s debian/VERSION.x2goagent LD_LIBRARY_PATH=`pwd`/debian/libnx-x11/usr/lib/nx/X11:$$LD_LIBRARY_PATH dh_auto_build --with quilt --parallel debian/post-build-nx.sh -override_dh_auto_install: - override_dh_strip: dh_strip --dbg-package=nx-x11-dbg diff --git a/debian/x2goagent.dirs b/debian/x2goagent.dirs index 042e97d05..548ecdfc7 100644 --- a/debian/x2goagent.dirs +++ b/debian/x2goagent.dirs @@ -1,3 +1,3 @@ usr/bin -usr/lib/nx -usr/share/x2go
\ No newline at end of file +usr/share/pixmaps +usr/share/x2go diff --git a/debian/x2goagent.install b/debian/x2goagent.install index 20019f1d8..72058a9d1 100644 --- a/debian/x2goagent.install +++ b/debian/x2goagent.install @@ -1,4 +1,5 @@ -bin/x2goagent usr/bin -debian/rgb usr/share/x2go -nx-X11/programs/Xserver/hw/nxagent/x2go.xpm usr/share/pixmaps -debian/VERSION.x2goagent usr/share/x2go/versions
\ No newline at end of file +usr/bin/x2goagent +usr/lib/x2go/bin/x2goagent +usr/share/pixmaps/x2go.xpm +usr/share/x2go/rgb +usr/share/x2go/versions/VERSION.x2goagent diff --git a/debian/x2goagent.links b/debian/x2goagent.links deleted file mode 100644 index 2aebb6cb7..000000000 --- a/debian/x2goagent.links +++ /dev/null @@ -1 +0,0 @@ -usr/lib/nx/bin/nxagent usr/lib/x2go/bin/x2goagent |