[X2Go-Commits] [telekinesis] 01/01: theLIBDIR (server): Make sure that empty dir gets installed into telekinesis-server bin:package

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository telekinesis.

commit daef8eacc923a288290bfadd2197f1319396563e
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Jul 4 10:11:00 2014 +0200

    theLIBDIR (server): Make sure that empty dir gets installed into telekinesis-server bin:package
---
 debian/telekinesis-server.install   |    1 +
 server/Makefile                     |    4 ++++
 server/etc/telekinesis/server/paths |    2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/telekinesis-server.install b/debian/telekinesis-server.install
index 382a141..4b2ac9f 100644
--- a/debian/telekinesis-server.install
+++ b/debian/telekinesis-server.install
@@ -5,5 +5,6 @@ usr/share/telekinesis/server/
 usr/lib/x2go/extensions/post-start.d/
 usr/lib/x2go/extensions/post-suspend.d/
 usr/lib/x2go/extensions/pre-resume.d/
+usr/lib/telekinesis/server/
 usr/share/x2go/x2gofeature.d/
 usr/share/x2go/versions/VERSION.telekinesis-server
diff --git a/server/Makefile b/server/Makefile
index f952cea..be05ce2 100755
--- a/server/Makefile
+++ b/server/Makefile
@@ -75,6 +75,8 @@ install_config:
 install_data:
 	$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/server/vcomp/
 	$(INSTALL_FILE) share/telekinesis/server/vcomp/*.vc $(DESTDIR)$(SHAREDIR)/server/vcomp/
+	$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/server/applications/
+	$(INSTALL_FILE) lib/telekinesis/server/applications/.placeholder $(DESTDIR)$(LIBDIR)/server/applications/
 
 install_man:
 #	$(INSTALL_DIR) $(DESTDIR)$(MANDIR)
@@ -105,6 +107,8 @@ uninstall_config:
 uninstall_data:
 	$(RM_FILE) $(DESTDIR)$(SHAREDIR)/server/vcomp/*.vc
 	$(RM_DIR)  $(DESTDIR)$(SHAREDIR)/server/vcomp/
+	$(RM_FILE) $(DESTDIR)$(LIBDIR)/client/applications/.placeholder
+	$(RM_DIR) $(DESTDIR)$(LIBDIR)/client/applications/
 
 uninstall_man:
 #	for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(MANDIR)/man8/$$file.8.gz; done
diff --git a/server/etc/telekinesis/server/paths b/server/etc/telekinesis/server/paths
index a84f34a..d7a0d56 100644
--- a/server/etc/telekinesis/server/paths
+++ b/server/etc/telekinesis/server/paths
@@ -1,3 +1,3 @@
 D:SHARE=/usr/share/telekinesis
 D:BIN=/usr/bin
-#D:LIB=/usr/lib/telekinesis
+D:LIB=/usr/lib/telekinesis
diff --git a/server/lib/telekinesis/server/applications/.placeholder b/server/lib/telekinesis/server/applications/.placeholder
new file mode 100644
index 0000000..e69de29

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/telekinesis.git