[X2Go-Commits] x2goserver.git - build-baikal (branch) updated: 3.0.99.8-25-g123bd19

X2Go dev team git-admin at x2go.org
Fri Jan 3 18:04:34 CET 2014


The branch, build-baikal has been updated
       via  123bd195c9288a5606bd1b4f807bbdc5651e907f (commit)
      from  0ddcb23f0faddfecec4c16bcc67ee7fddf2d1772 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 Makefile                                           |    6 ++++++
 .../Makefile                                       |    9 ++++-----
 .../VERSION.x2goserver-pyhoca                      |    0
 3 files changed, 10 insertions(+), 5 deletions(-)
 copy {x2goserver-printing => x2goserver-pyhoca}/Makefile (90%)
 copy x2goserver-compat/VERSION.x2goserver-compat => x2goserver-pyhoca/VERSION.x2goserver-pyhoca (100%)

The diff of changes is:
diff --git a/Makefile b/Makefile
index 657dcfc..e7efc9f 100755
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,7 @@ build_man2html:
 	cd x2goserver-compat && make $@
 	cd x2goserver-extensions && make $@
 	cd x2goserver-xsession && make $@
+	cd x2goserver-pyhoca && make $@
 
 clean:
 	cd x2goserver && make $@
@@ -18,6 +19,7 @@ clean:
 	cd x2goserver-compat && make $@
 	cd x2goserver-extensions && make $@
 	cd x2goserver-xsession && make $@
+	cd x2goserver-pyhoca && make $@
 
 build-arch:
 	cd x2goserver && make $@
@@ -25,6 +27,7 @@ build-arch:
 	cd x2goserver-compat && make $@
 	cd x2goserver-extensions && make $@
 	cd x2goserver-xsession && make $@
+	cd x2goserver-pyhoca && make $@
 
 build-indep:
 	cd x2goserver && make $@
@@ -32,6 +35,7 @@ build-indep:
 	cd x2goserver-compat && make $@
 	cd x2goserver-extensions && make $@
 	cd x2goserver-xsession && make $@
+	cd x2goserver-pyhoca && make $@
 
 install:
 	cd x2goserver && make $@
@@ -39,6 +43,7 @@ install:
 	cd x2goserver-compat && make $@
 	cd x2goserver-extensions && make $@
 	cd x2goserver-xsession && make $@
+	cd x2goserver-pyhoca && make $@
 
 uninstall:
 	cd x2goserver-extensions && make $@
@@ -46,5 +51,6 @@ uninstall:
 	cd x2goserver-printing && make $@
 	cd x2goserver && make $@
 	cd x2goserver-xsession && make $@
+	cd x2goserver-pyhoca && make $@
 
 
diff --git a/x2goserver-printing/Makefile b/x2goserver-pyhoca/Makefile
similarity index 90%
copy from x2goserver-printing/Makefile
copy to x2goserver-pyhoca/Makefile
index 04f93bf..aa6a562 100755
--- a/x2goserver-printing/Makefile
+++ b/x2goserver-pyhoca/Makefile
@@ -15,7 +15,7 @@ PREFIX=/usr/local
 ETCDIR=/etc/x2go
 BINDIR=$(PREFIX)/bin
 #SBINDIR=$(PREFIX)/sbin
-#LIBDIR=$(PREFIX)/lib/x2go
+LIBDIR=$(PREFIX)/lib/x2go
 MANDIR=$(PREFIX)/share/man
 SHAREDIR=$(PREFIX)/share/x2go
 
@@ -53,11 +53,10 @@ 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)$(SHAREDIR)
+	$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/x2gofeature.d
 	$(INSTALL_PROGRAM) bin/*                $(DESTDIR)$(BINDIR)/
 #	$(INSTALL_PROGRAM) sbin/*               $(DESTDIR)$(SBINDIR)/
-#	$(INSTALL_FILE) lib/*                   $(DESTDIR)$(LIBDIR)/
 	$(INSTALL_PROGRAM) share/x2gofeature.d/*.features $(DESTDIR)$(SHAREDIR)/x2gofeature.d/
 
 install_config:
@@ -76,7 +75,7 @@ install_man:
 install_version:
 	$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)
 	$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/versions
-	$(INSTALL_FILE) VERSION.x2goserver-printing     $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-printing
+	$(INSTALL_FILE) VERSION.x2goserver-pyhoca     $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-pyhoca
 
 uninstall: uninstall_scripts uninstall_config uninstall_man uninstall_version
 
@@ -99,5 +98,5 @@ uninstall_man:
 	$(RM_DIR)  $(DESTDIR)$(MANDIR) || true
 
 uninstall_version:
-	$(RM_FILE) $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-printing
+	$(RM_FILE) $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-pyhoca
 	$(RM_DIR)  $(DESTDIR)$(SHAREDIR)/versions || true
diff --git a/x2goserver-compat/VERSION.x2goserver-compat b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca
similarity index 100%
copy from x2goserver-compat/VERSION.x2goserver-compat
copy to x2goserver-pyhoca/VERSION.x2goserver-pyhoca


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