The branch, release/4.0.1.x has been updated via db8de1a0fd565e3059b90da73efb3b006df3c5f3 (commit) from 13bdacd0f6da59323af0954b5df0359eddb82b8f (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 db8de1a0fd565e3059b90da73efb3b006df3c5f3 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Dec 28 23:42:14 2013 +0100 update Makefiles from master branch ----------------------------------------------------------------------- Summary of changes: x2goserver-extensions/Makefile | 6 +++--- x2goserver-fmbindings/Makefile | 14 +++++++------- x2goserver-printing/Makefile | 23 +++++------------------ x2goserver-xsession/Makefile | 29 ++++++----------------------- 4 files changed, 21 insertions(+), 51 deletions(-) The diff of changes is: diff --git a/x2goserver-extensions/Makefile b/x2goserver-extensions/Makefile index f357856..c28d749 100755 --- a/x2goserver-extensions/Makefile +++ b/x2goserver-extensions/Makefile @@ -29,12 +29,12 @@ MAN2HTML_DEST = .build_man2html/html all: clean build -build: build-indep - -build-indep: build_man2html +build: build-arch build-indep build-arch: +build-indep: build_man2html + build_man2html: mkdir -p $(MAN2HTML_DEST) for man_page in $(man_pages); do mkdir -p `dirname $(MAN2HTML_DEST)/$$man_page`; done diff --git a/x2goserver-fmbindings/Makefile b/x2goserver-fmbindings/Makefile index 248bd7a..1d4f1dd 100755 --- a/x2goserver-fmbindings/Makefile +++ b/x2goserver-fmbindings/Makefile @@ -29,12 +29,12 @@ MAN2HTML_DEST = .build_man2html/html all: clean build -build: build-indep - -build-indep: build_man2html +build: build-arch build-indep build-arch: +build-indep: build_man2html + build_man2html: mkdir -p $(MAN2HTML_DEST) for man_page in $(man_pages); do mkdir -p `dirname $(MAN2HTML_DEST)/$$man_page`; done @@ -53,10 +53,10 @@ install_scripts: $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR) $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/x2gofeature.d $(INSTALL_PROGRAM) share/x2go/x2gofeature.d/*.features $(DESTDIR)$(SHAREDIR)/x2gofeature.d/ - $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/applications - $(INSTALL_PROGRAM) share/applications/x2gofm.desktop $(DESTDIR)$(SHAREDIR)/applications/ - $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/mime/packages - $(INSTALL_PROGRAM) share/mime/packages/sshfs-x2go.xml $(DESTDIR)$(SHAREDIR)/mime/packages/ + $(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/applications + $(INSTALL_PROGRAM) share/applications/x2gofm.desktop $(DESTDIR)$(PREFIX)/share/applications/ + $(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/mime/packages + $(INSTALL_PROGRAM) share/mime/packages/sshfs-x2go.xml $(DESTDIR)$(PREFIX)/share/mime/packages/ install_config: diff --git a/x2goserver-printing/Makefile b/x2goserver-printing/Makefile index 0f14d37..d7ff4a3 100755 --- a/x2goserver-printing/Makefile +++ b/x2goserver-printing/Makefile @@ -14,8 +14,8 @@ DESTDIR ?= PREFIX ?= /usr/local ETCDIR=/etc/x2go BINDIR=$(PREFIX)/bin -#SBINDIR=$(PREFIX)/sbin -#LIBDIR=$(PREFIX)/lib/x2go +SBINDIR=$(PREFIX)/sbin +LIBDIR=$(PREFIX)/lib/x2go MANDIR=$(PREFIX)/share/man SHAREDIR=$(PREFIX)/share/x2go @@ -30,12 +30,12 @@ MAN2HTML_DEST = .build_man2html/html all: clean build -build: build-indep - -build-indep: build_man2html +build: build-arch build-indep build-arch: +build-indep: build_man2html + build_man2html: mkdir -p $(MAN2HTML_DEST) for man_page in $(man_pages); do mkdir -p `dirname $(MAN2HTML_DEST)/$$man_page`; done @@ -51,16 +51,10 @@ install: install_scripts install_config install_man install_version install_scripts: $(INSTALL_DIR) $(DESTDIR)$(BINDIR) $(INSTALL_PROGRAM) bin/* $(DESTDIR)$(BINDIR)/ - $(INSTALL_PROGRAM) bin/* $(DESTDIR)$(BINDIR)/ $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/x2gofeature.d/ $(INSTALL_PROGRAM) share/x2gofeature.d/*.features $(DESTDIR)$(SHAREDIR)/x2gofeature.d/ install_config: -# $(INSTALL_DIR) $(DESTDIR)$(ETCDIR) -# $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/x2gosql -# $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/x2gosql/passwords -# $(INSTALL_FILE) etc/x2goserver.conf $(DESTDIR)$(ETCDIR)/ -# $(INSTALL_FILE) etc/x2gosql/sql $(DESTDIR)$(ETCDIR)/x2gosql install_man: $(INSTALL_DIR) $(DESTDIR)$(MANDIR) @@ -77,16 +71,9 @@ uninstall: uninstall_scripts uninstall_config uninstall_man uninstall_version uninstall_scripts: for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(BINDIR)/$$file; done -# for file in $(SBIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SBINDIR)/$$file; done -# for file in $(LIB_FILES); do $(RM_FILE) $(DESTDIR)$(LIBDIR)/$$file; done for file in $(FEATURE_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SHAREDIR)/x2gofeature.d/$$file; done uninstall_config: -# $(RM_FILE) $(DESTDIR)$(ETCDIR)/x2goserver.conf -# $(RM_FILE) $(DESTDIR)$(ETCDIR)/x2gosql/sql -# $(RM_DIR) $(DESTDIR)$(ETCDIR) || true -# $(RM_DIR) $(DESTDIR)$(ETCDIR)/x2gosql/passwords || true -# $(RM_DIR) $(DESTDIR)$(ETCDIR)/x2gosql || true uninstall_man: for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(MANDIR)/man8/$$file.8.gz; done diff --git a/x2goserver-xsession/Makefile b/x2goserver-xsession/Makefile index 899d2d7..7ff0dfc 100755 --- a/x2goserver-xsession/Makefile +++ b/x2goserver-xsession/Makefile @@ -14,9 +14,9 @@ RM_DIR=rmdir -p --ignore-fail-on-non-empty DESTDIR ?= PREFIX ?= /usr/local ETCDIR=/etc/x2go -#BINDIR=$(PREFIX)/bin -#SBINDIR=$(PREFIX)/sbin -#LIBDIR=$(PREFIX)/lib/x2go +BINDIR=$(PREFIX)/bin +SBINDIR=$(PREFIX)/sbin +LIBDIR=$(PREFIX)/lib/x2go MANDIR=$(PREFIX)/share/man SHAREDIR=$(PREFIX)/share/x2go @@ -30,31 +30,23 @@ FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && echo *.features) all: clean build -build: build-indep - -build-indep: build_man2html +build: build-arch build-indep build-arch: +build-indep: build_man2html + build_man2html: -# mkdir -p $(MAN2HTML_DEST) -# for man_page in $(man_pages); do mkdir -p `dirname $(MAN2HTML_DEST)/$$man_page`; done -# for man_page in $(man_pages); do $(MAN2HTML_BIN) $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done clean: clean_man2html clean_man2html: -# rm -rf `dirname $(MAN2HTML_DEST)` install: install_scripts install_config install_man install_version install_scripts: -# $(INSTALL_DIR) $(DESTDIR)$(BINDIR) -# $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR) $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/x2gofeature.d -# $(INSTALL_PROGRAM) bin/* $(DESTDIR)$(BINDIR)/ -# $(INSTALL_PROGRAM) sbin/* $(DESTDIR)$(SBINDIR)/ $(INSTALL_PROGRAM) share/x2gofeature.d/*.features $(DESTDIR)$(SHAREDIR)/x2gofeature.d/ install_config: @@ -68,10 +60,6 @@ install_config: if [ -e /etc/redhat-release ]; then if [ -d $(XCLIENTSDIR) ]; then $(INSTALL_SYMLINK) $(XCLIENTSDIR) $(DESTDIR)$(ETCDIR)/Xclients.d; else $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/Xclients.d; fi; fi install_man: -# $(INSTALL_DIR) $(DESTDIR)$(MANDIR) -# $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man8 -# $(INSTALL_FILE) man/man8/*.8 $(DESTDIR)$(MANDIR)/man8 -# gzip -f $(DESTDIR)$(MANDIR)/man8/x2go*.8 install_version: $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR) @@ -81,17 +69,12 @@ install_version: uninstall: uninstall_scripts uninstall_config uninstall_man uninstall_version uninstall_scripts: -# for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(BINDIR)/$$file; done -# for file in $(SBIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SBINDIR)/$$file; done for file in $(FEATURE_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SHAREDIR)/x2gofeature.d/$$file; done uninstall_config: for file in $(ETC_FILES); do $(RM_FILE) $(DESTDIR)$(ETCDIR)/$$file; done uninstall_man: -# for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(MANDIR)/man8/$$file.8.gz; done -# for file in $(SBIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(MANDIR)/man8/$$file.8.gz; done -# $(RM_DIR) $(DESTDIR)$(MANDIR) || true uninstall_version: $(RM_FILE) $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-xsession hooks/post-receive -- x2goserver.git (X2Go Server) 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 "x2goserver.git" (X2Go Server).