The branch, master has been updated via 0a8fd25818b9804156181048bc8fe1c414f94bc6 (commit) from 68b59d548eab7045eabb3c4e55691f103e15677f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 0a8fd25818b9804156181048bc8fe1c414f94bc6 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Dec 11 10:29:46 2013 +0100 x2goadmincenter.spec: patch cgi-bin dir in Makefile ----------------------------------------------------------------------- Summary of changes: x2goadmincenter.spec | 3 ++- x2goadminserver/Makefile | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/x2goadmincenter.spec b/x2goadmincenter.spec index ccfa17e..9a34c51 100644 --- a/x2goadmincenter.spec +++ b/x2goadmincenter.spec @@ -60,7 +60,8 @@ For installation instruction/howtos/FAQs please visit http://wiki.x2go.org # Fix up install issues sed -i -e 's/-o root -g root//' x2goadmincenter/Makefile sed -i -e 's/-o root -g root//' x2goadminserver/Makefile -find -type f | xargs sed -i -r -e '/^LIBDIR=/s,/lib/,/%{_lib}/,' +find -type f -name "*/Makefile" | xargs sed -i -r -e '/^LIBDIR=/s,/lib/,/%{_lib}/,' +sed -i x2goadminserver/Makefile -e '/^CGIBINDIR=/s,/lib/,/%{_lib}/,' %build %if 0%{?el5} diff --git a/x2goadminserver/Makefile b/x2goadminserver/Makefile index d785a7b..bfa152a 100755 --- a/x2goadminserver/Makefile +++ b/x2goadminserver/Makefile @@ -16,6 +16,7 @@ BINDIR=$(PREFIX)/bin SHAREDIR=$(PREFIX)/share MANDIR=$(SHAREDIR)/man LIBDIR=$(PREFIX)/lib/x2go +CGIBINDIR=$(PREFIX)/lib/cgi-bin all: build @@ -41,8 +42,8 @@ install_adminserver: $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/ $(INSTALL_FILE) $(CURDIR)/etc/x2goadminserver.conf $(DESTDIR)$(ETCDIR)/ $(INSTALL_FILE) $(CURDIR)/lib/* $(DESTDIR)$(LIBDIR)/ - $(INSTALL_DIR) $(DESTDIR)$(PREFIX)/lib/cgi-bin - $(INSTALL_FILE) $(CURDIR)/cgi-bin/* $(DESTDIR)$(PREFIX)/lib/cgi-bin + $(INSTALL_DIR) $(DESTDIR)$(CGIBINDIR)/ + $(INSTALL_FILE) $(CURDIR)/cgi-bin/* $(DESTDIR)$(CGIBINDIR)/ install_man: $(INSTALL_DIR) $(DESTDIR)$(MANDIR) @@ -57,12 +58,12 @@ uninstall: uninstall_adminserver uninstall_man uninstall_adminserver: $(RM_FILE) $(ETCDIR)/x2goadminserver.conf - $(RM_FILE) $(PREFIX)/lib/cgi-bin/x2gorpcserver.cgi + $(RM_FILE) $(CGIBINDIR)/x2gorpcserver.cgi $(RM_FILE) $(LIBDIR)/x2goadminserver.pm $(RM_FILE) $(LIBDIR)/x2goadminserver_backend_*.pm $(RM_DIR) $(ETCDIR)/ $(RM_DIR) $(LIBDIR)/ - $(RM_DIR) $(PREFIX)/lib/cgi-bin/ + $(RM_DIR) $(CGIBINDIR)/ uninstall_man: $(RM_FILE) $(DESTDIR)$(MANDIR)/man5/x2goadminserver.conf.5.gz hooks/post-receive -- x2goadmincenter.git (X2Go Administration Center) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goadmincenter.git" (X2Go Administration Center).