[X2go-Commits] nxcomp.git - backport-lenny (branch) updated: 3.4.0.8-11-gd4c4191

[X2go dev team]

The branch, backport-lenny has been updated
       via  d4c4191c5f65664d7a29b46d9f6f8820f61dc0c3 (commit)
      from  edae296ab013fcd64d50850e7b47c61cd181ba6a (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 d4c4191c5f65664d7a29b46d9f6f8820f61dc0c3
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jul 4 16:53:00 2011 +0200

    fix INSTALL dir action

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

Summary of changes:
 Makefile.in |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

The diff of changes is:
diff --git a/Makefile.in b/Makefile.in
index 1db60c6..169f65b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -66,7 +66,6 @@ man1dir     = @mandir@/man1
 VPATH       = @srcdir@
 
 INSTALL         = @INSTALL@
-INSTALL		= @INSTALL_DIR@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA    = @INSTALL_DATA@
 INSTALL_LINK    = cp -av
@@ -273,14 +272,15 @@ install:	install.bin install.lib install.man
 install.bin:
 
 install.lib: all
-	$(INSTALL_DIR) $(DESTDIR)$(prefix)/lib
+	./mkinstalldirs $(DESTDIR)$(prefix)/lib
+	./mkinstalldirs $(DESTDIR)$(prefix)/include
 	$(INSTALL_DATA) libXcomp.so.3.*         $(DESTDIR)$(prefix)/lib
 	$(INSTALL_LINK) libXcomp.so.3           $(DESTDIR)$(prefix)/lib
 	$(INSTALL_LINK) libXcomp.so             $(DESTDIR)$(prefix)/lib
 	$(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:
 
@@ -301,7 +301,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:
 


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