x2goserver.git - master (branch) updated: 3.1.0.0-7-gdd6fb08 - x2go-commits

1 Mar 2012

The branch, master has been updated
       via  dd6fb08b75cec6f5b0cf159dd3dc1c0adafd5d53 (commit)
      from  8fd1754c73f52028db96187f2d810e0c534b2777 (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 dd6fb08b75cec6f5b0cf159dd3dc1c0adafd5d53
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Thu Mar 1 20:33:02 2012 +0100

    Fix Makefile of x2goserver-fmbindings (thanks to Oliver Burger), improve uninstall code in Makefiles.

-----------------------------------------------------------------------

Summary of changes:
 Makefile                       |   17 +++++++++++++++--
 debian/changelog               |    2 ++
 x2goserver-extensions/Makefile |   26 +++++++++++++++++++++++++-
 x2goserver-fmbindings/Makefile |    8 ++++----
 4 files changed, 46 insertions(+), 7 deletions(-)

The diff of changes is:

diff --git a/Makefile b/Makefile
index da9d5db..3be40f9 100755
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,14 @@
 #!/usr/bin/make -f
 
+RM_FILE=rm -f
+RM_DIR=rmdir -p --ignore-fail-on-non-empty
+
+DESTDIR=
+PREFIX=/usr/local
+ETCDIR=/etc/x2go
+LIBDIR=$(PREFIX)/lib/x2go
+SHAREDIR=$(PREFIX)/share/x2go
+
 all: build
 
 build: build-arch build-indep
@@ -51,10 +60,14 @@ install:
 	$(MAKE) -C x2goserver-pyhoca $@
 
 uninstall:
-	$(MAKE) -C x2goserver $@
 	$(MAKE) -C x2goserver-printing $@
 	$(MAKE) -C x2goserver-compat $@
-	$(MAKE) -C x2goserver-extensions $@
 	$(MAKE) -C x2goserver-xsession $@
 	$(MAKE) -C x2goserver-fmbindings $@
 	$(MAKE) -C x2goserver-pyhoca $@
+	$(MAKE) -C x2goserver-extensions $@
+	$(MAKE) -C x2goserver $@
+	if test -d $(DESTDIR)$(LIBDIR); then $(RM_DIR) $(DESTDIR)$(LIBDIR); fi
+	if test -d $(DESTDIR)$(SHAREDIR)/x2gofeature.d; then $(RM_DIR) $(DESTDIR)$(SHAREDIR)/x2gofeature.d; fi
+	if test -d $(DESTDIR)$(SHAREDIR); then $(RM_DIR) $(DESTDIR)$(SHAREDIR); fi
+	if test -d $(DESTDIR)$(ETCDIR); then $(RM_DIR) $(DESTDIR)$(ETCDIR); fi
diff --git a/debian/changelog b/debian/changelog
index d5664c6..7e2e1ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ x2goserver (3.1.0.1-0~x2go1) UNRELEASED; urgency=low
     - Do only run session cleanup scripts from within
       x2goruncommand. Dropping them from x2goterminate-session.
     - Be tolerant against x2go_logout script failures.
+    - Fix Makefile of x2goserver-fmbindings (thanks to Oliver Burger),
+      improve uninstall code in Makefiles.
 
  -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Wed, 22 Feb 2012 15:10:12 +0100
 
diff --git a/x2goserver-extensions/Makefile b/x2goserver-extensions/Makefile
index 2fe807c..d3bbbb6 100755
--- a/x2goserver-extensions/Makefile
+++ b/x2goserver-extensions/Makefile
@@ -22,7 +22,7 @@ SHAREDIR=$(PREFIX)/share/x2go
 BIN_SCRIPTS=$(shell cd bin && ls)
 #SBIN_SCRIPTS=$(shell cd sbin && ls)
 #LIB_FILES=$(shell cd lib && ls)
-FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && ls *.features)
+FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && ls *.features .placeholder)
 
 man_pages = `cd man && find * -type f`
 
@@ -110,6 +110,30 @@ uninstall_scripts:
 #	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
+	$(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/fail-start.d/.placeholder
+	$(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/pre-resume.d/.placeholder
+	$(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/post-resume.d/.placeholder
+	$(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/fail-resume.d/.placeholder
+	$(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/pre-suspend.d/.placeholder
+	$(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/post-suspend.d/.placeholder
+	$(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/fail-suspend.d/.placeholder
+	$(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/pre-terminate.d/.placeholder
+	$(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/post-terminate.d/.placeholder
+	$(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/fail-terminate.d/.placeholder
+	$(RM_DIR) $(DESTDIR)$(LIBDIR)/extensions/pre-start.d/
+	$(RM_DIR) $(DESTDIR)$(LIBDIR)/extensions/post-start.d/
+	$(RM_DIR) $(DESTDIR)$(LIBDIR)/extensions/fail-start.d/
+	$(RM_DIR) $(DESTDIR)$(LIBDIR)/extensions/pre-resume.d/
+	$(RM_DIR) $(DESTDIR)$(LIBDIR)/extensions/post-resume.d/
+	$(RM_DIR) $(DESTDIR)$(LIBDIR)/extensions/fail-resume.d/
+	$(RM_DIR) $(DESTDIR)$(LIBDIR)/extensions/pre-suspend.d/
+	$(RM_DIR) $(DESTDIR)$(LIBDIR)/extensions/post-suspend.d/
+	$(RM_DIR) $(DESTDIR)$(LIBDIR)/extensions/fail-suspend.d/
+	$(RM_DIR) $(DESTDIR)$(LIBDIR)/extensions/pre-terminate.d/
+	$(RM_DIR) $(DESTDIR)$(LIBDIR)/extensions/post-terminate.d/
+	$(RM_DIR) $(DESTDIR)$(LIBDIR)/extensions/fail-terminate.d/
 	for file in $(FEATURE_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SHAREDIR)/x2gofeature.d/$$file; done
 
 uninstall_config:
diff --git a/x2goserver-fmbindings/Makefile b/x2goserver-fmbindings/Makefile
index bd9aa69..a9d8da5 100755
--- a/x2goserver-fmbindings/Makefile
+++ b/x2goserver-fmbindings/Makefile
@@ -22,7 +22,7 @@ SHAREDIR=$(PREFIX)/share/x2go
 BIN_SCRIPTS=$(shell cd bin && ls)
 #SBIN_SCRIPTS=$(shell cd sbin && ls)
 #LIB_FILES=$(shell cd lib && ls)
-FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && ls *.features)
+FEATURE_SCRIPTS=$(shell cd share/x2go/x2gofeature.d && ls *.features)
 
 man_pages = `cd man && find * -type f`
 
@@ -53,7 +53,7 @@ install: install_scripts install_config install_man install_version
 install_scripts:
 	$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)
 	$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/x2gofeature.d
-	$(INSTALL_PROGRAM) share/x2gofeature.d/*.features $(DESTDIR)$(SHAREDIR)/x2gofeature.d/
+	$(INSTALL_PROGRAM) share/x2go/x2gofeature.d/*.features $(DESTDIR)$(SHAREDIR)/x2gofeature.d/
 
 install_config:
 
@@ -66,7 +66,7 @@ install_man:
 install_version:
 	$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)
 	$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/versions
-	$(INSTALL_FILE) VERSION.x2goserver-extensions     $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-extensions
+	$(INSTALL_FILE) VERSION.x2goserver-fmbindings     $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-fmbindings
 
 uninstall: uninstall_scripts uninstall_config uninstall_man uninstall_version
 
@@ -81,5 +81,5 @@ uninstall_man:
 	$(RM_DIR)  $(DESTDIR)$(MANDIR) || true
 
 uninstall_version:
-	$(RM_FILE) $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-extensions
+	$(RM_FILE) $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-fmbindings
 	$(RM_DIR)  $(DESTDIR)$(SHAREDIR)/versions || true


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).

    