[X2Go-Commits] x2goserver.git - master (branch) updated: 3.1.1.3-289-g0c1440d
X2Go dev team
git-admin at x2go.org
Tue Dec 10 10:30:17 CET 2013
The branch, master has been updated
via 0c1440d6689ada169faa5dc12d3112e52bf26f90 (commit)
from bb6c22da7518d9042f1b6eab78645bf092ce82e5 (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 0c1440d6689ada169faa5dc12d3112e52bf26f90
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Tue Dec 10 10:14:20 2013 +0100
Clean up Makefiles, remove commented out line.
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 1 +
x2goserver-extensions/Makefile | 17 -----------------
x2goserver-fmbindings/Makefile | 3 ---
x2goserver-printing/Makefile | 2 --
x2goserver-xsession/Makefile | 9 ---------
5 files changed, 1 insertion(+), 31 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index f347917..8fccd48 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -86,6 +86,7 @@ x2goserver (4.0.1.10-0x2go1) UNRELEASED; urgency=low
- x2goserver-printing/Makefile: create feature.d directory before installing
files into it.
- Handle TCP listening of x2goagent in x2goagent.options. (Fixes: #354).
+ - Clean up Makefiles, remove commented out line.
* Grab systemd service file from Fedora and ship it upstream.
* Add init script for RPM based distro. Taken from the Fedora
package.
diff --git a/x2goserver-extensions/Makefile b/x2goserver-extensions/Makefile
index ff5563a..c28d749 100755
--- a/x2goserver-extensions/Makefile
+++ b/x2goserver-extensions/Makefile
@@ -14,14 +14,11 @@ DESTDIR ?=
PREFIX ?= /usr/local
ETCDIR=/etc/x2go
BINDIR=$(PREFIX)/bin
-#SBINDIR=$(PREFIX)/sbin
LIBDIR=$(PREFIX)/lib/x2go
MANDIR=$(PREFIX)/share/man
SHAREDIR=$(PREFIX)/share/x2go
BIN_SCRIPTS=$(shell cd bin && echo *)
-#SBIN_SCRIPTS=$(shell cd sbin && echo *)
-#LIB_FILES=$(shell cd lib && echo *)
FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && echo *.features .placeholder)
man_pages = `cd man && find * -type f`
@@ -52,7 +49,6 @@ install: install_scripts install_config install_man install_version
install_scripts:
$(INSTALL_DIR) $(DESTDIR)$(BINDIR)
-# $(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/extensions
$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/extensions/pre-start.d
@@ -70,7 +66,6 @@ install_scripts:
$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)
$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/x2gofeature.d
$(INSTALL_PROGRAM) bin/* $(DESTDIR)$(BINDIR)/
-# $(INSTALL_PROGRAM) sbin/* $(DESTDIR)$(SBINDIR)/
$(INSTALL_FILE) lib/extensions/pre-start.d/.placeholder $(DESTDIR)$(LIBDIR)/extensions/pre-start.d/
$(INSTALL_FILE) lib/extensions/post-start.d/.placeholder $(DESTDIR)$(LIBDIR)/extensions/post-start.d/
$(INSTALL_FILE) lib/extensions/fail-start.d/.placeholder $(DESTDIR)$(LIBDIR)/extensions/fail-start.d/
@@ -86,11 +81,6 @@ install_scripts:
$(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)
@@ -107,8 +97,6 @@ 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
$(RM_DIR) $(DESTDIR)$(LIBDIR)/extensions/ || true
$(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/pre-start.d/.placeholder
$(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/post-start.d/.placeholder
@@ -137,11 +125,6 @@ uninstall_scripts:
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-fmbindings/Makefile b/x2goserver-fmbindings/Makefile
index c5c7311..1d4f1dd 100755
--- a/x2goserver-fmbindings/Makefile
+++ b/x2goserver-fmbindings/Makefile
@@ -14,14 +14,11 @@ DESTDIR ?=
PREFIX ?= /usr/local
ETCDIR=/etc/x2go
BINDIR=$(PREFIX)/bin
-#SBINDIR=$(PREFIX)/sbin
LIBDIR=$(PREFIX)/lib/x2go
MANDIR=$(PREFIX)/share/man
SHAREDIR=$(PREFIX)/share/x2go
BIN_SCRIPTS=$(shell cd bin && echo *)
-#SBIN_SCRIPTS=$(shell cd sbin && echo *)
-#LIB_FILES=$(shell cd lib && echo *)
FEATURE_SCRIPTS=$(shell cd share/x2go/x2gofeature.d && echo *.features)
man_pages = `cd man && find * -type f`
diff --git a/x2goserver-printing/Makefile b/x2goserver-printing/Makefile
index e5df4b8..d7ff4a3 100755
--- a/x2goserver-printing/Makefile
+++ b/x2goserver-printing/Makefile
@@ -20,8 +20,6 @@ MANDIR=$(PREFIX)/share/man
SHAREDIR=$(PREFIX)/share/x2go
BIN_SCRIPTS=$(shell cd bin && echo *)
-#SBIN_SCRIPTS=$(shell cd sbin && echo *)
-#LIB_FILES=$(shell cd lib && echo *)
FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && echo *.features)
man_pages = `cd man && find * -type f`
diff --git a/x2goserver-xsession/Makefile b/x2goserver-xsession/Makefile
index 134cd81..14bad33 100755
--- a/x2goserver-xsession/Makefile
+++ b/x2goserver-xsession/Makefile
@@ -23,18 +23,9 @@ SHAREDIR=$(PREFIX)/share/x2go
XSESSIONDIR ?= /etc/X11/Xsession.d
XSESSIONOPTIONFILE ?= /etc/X11/Xsession.options
-#BIN_SCRIPTS=$(shell cd bin && echo *)
-#SBIN_SCRIPTS=$(shell cd sbin && echo *)
-#LIB_FILES=$(shell cd lib && echo *)
ETC_FILES=$(shell cd etc && echo *)
FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && echo *.features)
-#man_pages = `cd man && find * -type f`
-
-#MAN2HTML_BIN = man2html
-#MAN2HTML_SRC = man
-#MAN2HTML_DEST = .build_man2html/html
-
all: clean build
build: build-arch build-indep
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).
More information about the x2go-commits
mailing list