On Saturday 2012-11-10 22:25, Mike Gabriel wrote:
please send a tested patch against the tarball of 3.5.0.16. Thanks!
The new 001_add-main-makefile.full+lite.patch breaks the build here when not running make install as root, e.g. when building a package with make DESTDIR="foo" install:
make[1]: Leaving directory `/build/src/nx-libs-3.5.0.16/nx-X11' if test -f bin/Makefile; then make -C bin install; fi make[1]: Entering directory `/build/src/nx-libs-3.5.0.16/bin' install -d -o root -g root -m 755 /usr/local/lib/x2go/bin/ install: cannot create directory '/usr/local/lib/x2go': Permission denied make[1]: *** [install] Error 1
This seems to be the cause:
+INSTALL_DIR=install -d -o root -g root -m 755 +INSTALL_FILE=install -o root -g root -m 644 +INSTALL_PROGRAM=install -o root -g root -m 755
Yes and no. You mention DESTDIR, and you see that the directory it creates lacks "foo", so it can't be the -o root -g root. ---- Restore broken `make install DESTDIR=`, by adding $(DESTDIR) where necessary, as well as `mkdir -p`. --- bin/Makefile | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) Index: nx-libs-3.5.0.16/bin/Makefile =================================================================== --- nx-libs-3.5.0.16.orig/bin/Makefile +++ nx-libs-3.5.0.16/bin/Makefile @@ -17,13 +17,15 @@ X2GOLIBDIR=$(PREFIX)/lib/x2go echo "Nothing to do for $@..." install: - $(INSTALL_DIR) $(X2GOLIBDIR)/bin/ - ln -sf $(NXLIBDIR)/bin/nxagent $(X2GOLIBDIR)/bin/x2goagent - find nx* | while read file; do $(INSTALL_PROGRAM) $$file $(BINDIR)/; done - find x2go* | while read file; do $(INSTALL_PROGRAM) $$file $(BINDIR)/; done + mkdir -p $(DESTDIR)$(X2GOLIBDIR)/bin + $(INSTALL_DIR) $(DESTDIR)$(X2GOLIBDIR)/bin/ + ln -sf $(NXLIBDIR)/bin/nxagent $(DESTDIR)$(X2GOLIBDIR)/bin/x2goagent + mkdir -p $(DESTDIR)$(BINDIR) + find nx* | while read file; do $(INSTALL_PROGRAM) $$file $(DESTDIR)$(BINDIR)/; done + find x2go* | while read file; do $(INSTALL_PROGRAM) $$file $(DESTDIR)$(BINDIR)/; done uninstall: - find nx* | while read file; do rm -f $(BINDIR)/$$file; done - find x2go* | while read file; do rm -f $(BINDIR)/$$file; done - $(RM_FILE) $(X2GOLIBDIR)/bin/x2goagent - $(RM_DIR) $(X2GOLIBDIR)/bin/ + find nx* | while read file; do rm -f $(DESTDIR)$(BINDIR)/$$file; done + find x2go* | while read file; do rm -f $(DESTDIR)$(BINDIR)/$$file; done + $(RM_FILE) $(DESTDIR)$(X2GOLIBDIR)/bin/x2goagent + $(RM_DIR) $(DESTDIR)$(X2GOLIBDIR)/bin/