[X2go-Commits] nxcomp.git - master (branch) updated: 3.4.0.8-6-g109f5bf

[X2go dev team]

The branch, master has been updated
       via  109f5bf285c1610f9ff7431524d821dd0332941f (commit)
       via  b0f85dcb95ccad92e3176c2c0a8b60f0b4b6536e (commit)
      from  213cdabb7b15691be984a3a122cf35ba619eb3d0 (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 109f5bf285c1610f9ff7431524d821dd0332941f
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jul 4 16:57:27 2011 +0200

    Don't let Makefile run fail if ldconfig fails.

commit b0f85dcb95ccad92e3176c2c0a8b60f0b4b6536e
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jul 4 16:56:15 2011 +0200

    User mkinstalldirs to create install paths.

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

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

The diff of changes is:
diff --git a/Makefile.in b/Makefile.in
index f7668a5..109f147 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -272,6 +272,8 @@ install:	install.bin install.lib install.man
 install.bin:
 
 install.lib: all
+	./mkinstalldirs $(DESTDIR)$(prefix)/lib
+	./mkinstalldirs $(DESTDIR)$(prefix)/include
 	$(INSTALL) $(DESTDIR)$(prefix)/lib
 	$(INSTALL_DATA) libXcomp.so.3.*         $(DESTDIR)$(prefix)/lib
 	$(INSTALL_LINK) libXcomp.so.3           $(DESTDIR)$(prefix)/lib
@@ -279,7 +281,7 @@ install.lib: all
 	$(INSTALL_DATA) libXcomp.a              $(DESTDIR)$(prefix)/lib
 	$(INSTALL_DATA) NX*.h                   $(DESTDIR)$(prefix)/include
 	$(INSTALL_DATA) MD5.h                   $(DESTDIR)$(prefix)/include
-	echo "Running ldconfig tool, this may take a while..." && ldconfig
+	echo "Running ldconfig tool, this may take a while..." && ldconfig || true
 
 install.man:
 
@@ -300,7 +302,7 @@ uninstall.lib:
 	$(RM_FILE) $(DESTDIR)$(prefix)/include/NXrender.h
 	$(RM_FILE) $(DESTDIR)$(prefix)/include/NXvars.h
 	$(RM_FILE) $(DESTDIR)$(prefix)/include/MD5.h
-	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 bdaacc7..3b9eb3a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,12 @@
-nxcomp (3.5.0-1-0~x2go2) unstable; urgency=low
+nxcomp (3.5.0-1-0~x2go1) UNRELEASED; urgency=low
 
+  [Reinhard Tartler]
   * New upstream version
 
+  [Mike Gabriel]
+  * User mkinstalldirs to create install paths.
+  * Don't let Makefile run fail if ldconfig fails.
+
  -- Reinhard Tartler <siretart at tauware.de>  Wed, 29 Jun 2011 15:41:10 +0200
 
 nxcomp (3.4.0.8-0~x2go1) unstable; urgency=low


hooks/post-receive
-- 
nxcomp.git (NX comp 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 "nxcomp.git" (NX comp library).