[X2go-Commits] nxcompshad.git - master (branch) updated: 3.4.0.4-5-g62ed93b

[X2go dev team]

The branch, master has been updated
       via  62ed93b79d2e3880f6f837ecf9a4f033cd26bda5 (commit)
      from  15da210f5b7229481a08351174fa62fec0e540e7 (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 62ed93b79d2e3880f6f837ecf9a4f033cd26bda5
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jul 4 17:36:31 2011 +0200

    Don't let the Makefile run fail on ldconfig failure.

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

Summary of changes:
 Makefile.in      |    4 ++--
 debian/changelog |    1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/Makefile.in b/Makefile.in
index 3e5df7d..e93c896 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -195,7 +195,7 @@ install.lib: all
 	$(INSTALL_LINK) libXcompshad.so         $(DESTDIR)$(prefix)/lib
 	$(INSTALL_DATA) *.a                     $(DESTDIR)$(prefix)/lib/nx
 	$(INSTALL_DATA) *.h                     $(DESTDIR)$(prefix)/include/nx
-	echo "Running ldconfig tool, this may take a while..." && ldconfig
+	echo "Running ldconfig tool, this may take a while..." && ldconfig || true
 
 install.man:
 
@@ -211,7 +211,7 @@ uninstall.lib:
 	for header in *.h; do $(RM_FILE) $(DESTDIR)$(prefix)/include/nx/$$header; done
 	$(RM_DIR) $(DESTDIR)$(prefix)/lib/nx/
 	$(RM_DIR) $(DESTDIR)$(prefix)/include/nx/
-	echo "Running ldconfig tool, this may take a while..." && ldconfig
+	echo "Running ldconfig tool, this may take a while..." && ldconfig || true
 
 uninstall.man:
 
diff --git a/debian/changelog b/debian/changelog
index 59f25ce..b504cb6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 nxcompshad (3.5.0-2-0~x2go2) UNRELEASED; urgency=low
 
   * Add dh-autoreconf as build-dep
+  * Don't let the Makefile run fail on ldconfig failure.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Thu, 30 Jun 2011 17:51:34 +0200
 


hooks/post-receive
-- 
nxcompshad.git (NX compshad library)

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 "nxcompshad.git" (NX compshad library).