[X2Go-Commits] [x2goserver] 01/50: xsettings: add new stub.
git-admin at x2go.org
git-admin at x2go.org
Mon Mar 16 06:29:14 CET 2015
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch feature/x2goserver-xsettings
in repository x2goserver.
commit 10b847e9e3e6d9e8afb041d4a165558b32565dfc
Author: Mihai Moldovan <ionic at ionic.de>
Date: Sun Nov 23 01:50:20 2014 +0100
xsettings: add new stub.
---
Makefile | 7 ++++
x2goserver-xsettings/Makefile | 89 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 96 insertions(+)
diff --git a/Makefile b/Makefile
index 03b0484..3c78e94 100755
--- a/Makefile
+++ b/Makefile
@@ -25,6 +25,7 @@ build_man2html:
$(MAKE) -C x2goserver-extensions $@
$(MAKE) -C x2goserver-xsession $@
$(MAKE) -C x2goserver-fmbindings $@
+ $(MAKE) -C x2goserver-xsettings $@
clean:
-$(MAKE) -f Makefile.perl clean
@@ -35,6 +36,7 @@ clean:
$(MAKE) -C x2goserver-extensions $@
$(MAKE) -C x2goserver-xsession $@
$(MAKE) -C x2goserver-fmbindings $@
+ $(MAKE) -C x2goserver-xsettings $@
distclean:
-$(MAKE) -f Makefile.perl realclean
@@ -45,6 +47,7 @@ distclean:
$(MAKE) -C x2goserver-extensions clean
$(MAKE) -C x2goserver-xsession clean
$(MAKE) -C x2goserver-fmbindings clean
+ $(MAKE) -C x2goserver-xsettings clean
build-arch:
$(MAKE) -C x2goserver-common $@
@@ -54,6 +57,7 @@ build-arch:
$(MAKE) -C x2goserver-extensions $@
$(MAKE) -C x2goserver-xsession $@
$(MAKE) -C x2goserver-fmbindings $@
+ $(MAKE) -C x2goserver-xsettings $@
build-indep:
$(PERL) Makefile.PL INSTALLDIRS=$(PERL_INSTALLDIRS)
@@ -65,6 +69,7 @@ build-indep:
$(MAKE) -C x2goserver-extensions $@
$(MAKE) -C x2goserver-xsession $@
$(MAKE) -C x2goserver-fmbindings $@
+ $(MAKE) -C x2goserver-xsettings $@
install:
$(MAKE) -f Makefile.perl pure_install
@@ -75,11 +80,13 @@ install:
$(MAKE) -C x2goserver-extensions $@
$(MAKE) -C x2goserver-xsession $@
$(MAKE) -C x2goserver-fmbindings $@
+ $(MAKE) -C x2goserver-xsettings $@
uninstall:
$(MAKE) -C x2goserver-printing $@
$(MAKE) -C x2goserver-xsession $@
$(MAKE) -C x2goserver-fmbindings $@
+ $(MAKE) -C x2goserver-xsettings $@
$(MAKE) -C x2goserver-extensions $@
$(MAKE) -f Makefile.perl uninstall
$(MAKE) -C libx2go-server-db-perl $@
diff --git a/x2goserver-xsettings/Makefile b/x2goserver-xsettings/Makefile
new file mode 100755
index 0000000..6229b2c
--- /dev/null
+++ b/x2goserver-xsettings/Makefile
@@ -0,0 +1,89 @@
+#!/usr/bin/make -f
+
+SRC_DIR=$(CURDIR)
+SHELL=/bin/bash
+
+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
+
+RM_FILE=rm -f
+RM_DIR=rmdir -p --ignore-fail-on-non-empty
+
+DESTDIR ?=
+PREFIX ?= /usr/local
+ETCDIR=/etc/x2go
+BINDIR=$(PREFIX)/bin
+LIBDIR=$(PREFIX)/lib/x2go
+MANDIR=$(PREFIX)/share/man
+SHAREDIR=$(PREFIX)/share/x2go
+
+ETC_FILES=$(shell cd etc && echo *)
+LIB_FILES=$(shell cd lib && echo *)
+FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && echo *.features)
+
+man_pages = `cd man && find * -type f`
+
+MAN2HTML_BIN = $(shell which man2html)
+MAN2HTML_SRC = man
+MAN2HTML_DEST = .build_man2html/html
+
+all: clean build
+
+build: build-arch build-indep
+
+build-arch:
+
+build-indep: build_man2html
+
+build_man2html:
+ if [ -n "$(MAN2HTML_BIN)" ]; then \
+ 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; \
+ fi
+
+clean: clean_man2html
+
+clean_man2html:
+ rm -rf `dirname $(MAN2HTML_DEST)`
+
+install: install_scripts install_config install_man install_version
+
+install_scripts:
+ $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/extensions/post-start.d
+ $(INSTALL_PROGRAM) lib/x2go/extensions/post-start.d/* $(DESTDIR)$(LIBDIR)/extensions/post-start.d/
+ $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/x2gofeature.d
+ $(INSTALL_PROGRAM) share/x2gofeature.d/*.features $(DESTDIR)$(SHAREDIR)/x2gofeature.d/
+
+install_config:
+ $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)
+ $(INSTALL_FILE) etc/xsettings.conf $(DESTDIR)$(ETCDIR)/
+
+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)
+ $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/versions
+ $(INSTALL_FILE) VERSION.x2goserver-xsettings $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-xsettings
+
+uninstall: uninstall_scripts uninstall_config uninstall_man uninstall_version
+
+uninstall_scripts:
+ $(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/post-start.d/900_xsettingsd*
+ for file in $(FEATURE_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SHAREDIR)/x2gofeature.d/$$file; done
+
+uninstall_config:
+ $(RM_FILE) $(DESTDIR)$(ETCDIR)/xsettings.conf
+
+uninstall_man:
+ for file in man/man8/*.8; do $(RM_FILE) $(DESTDIR)$(MANDIR)/$${file#man}.gz; done
+ $(RM_DIR) $(DESTDIR)$(MANDIR) || true
+
+uninstall_version:
+ $(RM_FILE) $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-xsettings
+ $(RM_DIR) $(DESTDIR)$(SHAREDIR)/versions || true
--
Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
More information about the x2go-commits
mailing list