[X2Go-Commits] x2goserver.git - release/4.0.1.x (branch) updated: 4.0.1.9-15-g855c925

[X2Go dev team]

The branch, release/4.0.1.x has been updated
       via  855c9257bed7568482f3ccf042574ee91dca7d15 (commit)
      from  10a138860b0c44346c7e2d8fd160c97d468ce300 (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 855c9257bed7568482f3ccf042574ee91dca7d15
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Dec 9 15:42:48 2013 +0100

    x2goserver-printing/Makefile: create feature.d directory before installing files into it.
    
    Conflicts (resolved by Mike Gabriel):
    	x2goserver-printing/Makefile

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

Summary of changes:
 debian/changelog             |    2 ++
 x2goserver-printing/Makefile |    7 ++-----
 2 files changed, 4 insertions(+), 5 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index b37e645..3a54b9d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ x2goserver (4.0.1.10-0x2go1) UNRELEASED; urgency=low
       Thanks to Harvey Eneman for tracking this down!!! (Fixes: #355).
     - x2goserver-fmbindings/Makefile: install x2gofm.
     - x2goserver-fmbindings/Makefile: install share/applications and share/mime.
+    - x2goserver-printing/Makefile: create feature.d directory before installing
+      files into it.
   * 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-printing/Makefile b/x2goserver-printing/Makefile
index 8dc1339..325934c 100755
--- a/x2goserver-printing/Makefile
+++ b/x2goserver-printing/Makefile
@@ -52,12 +52,9 @@ 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_PROGRAM) bin/*                $(DESTDIR)$(BINDIR)/
-#	$(INSTALL_PROGRAM) sbin/*               $(DESTDIR)$(SBINDIR)/
-#	$(INSTALL_FILE) lib/*                   $(DESTDIR)$(LIBDIR)/
+	$(INSTALL_PROGRAM) bin/*                $(DESTDIR)$(BINDIR)/
+	$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/x2gofeature.d/
 	$(INSTALL_PROGRAM) share/x2gofeature.d/*.features $(DESTDIR)$(SHAREDIR)/x2gofeature.d/
 
 install_config:


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