[X2go-Commits] nxcompext.git - master (branch) updated: 3.5.0-1-3-gcb77771

X2go dev team git-admin at x2go.org
Thu Oct 13 23:34:47 CEST 2011


The branch, master has been updated
       via  cb77771f143e7e21dbe68c672ce8c531b257aae8 (commit)
      from  fc965130aee523a6f03f1e5497e488a6e18213c5 (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 cb77771f143e7e21dbe68c672ce8c531b257aae8
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Oct 13 23:33:20 2011 +0200

    use link_library macro from nxcompshad package

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

Summary of changes:
 debian/rules |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

The diff of changes is:
diff --git a/debian/rules b/debian/rules
index 1cd59cc..365ec09 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,17 +5,22 @@ DEB_BUILD_MULTIARCH ?= $(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)
 %:
 	dh --with autoreconf --parallel $@
 
-override_dh_auto_build:
-	if test  -f /usr/lib/$(DEB_BUILD_MULTIARCH)/libX11.so.6; then \
-	  ln -s /usr/lib/$(DEB_BUILD_MULTIARCH)/libX11.so.6 libX11.so; \
-	else \
-	  ln -s /usr/lib/libX11.so.6 libX11.so ;\
+define link_library
+	if test  -f /usr/lib/$(DEB_BUILD_MULTIARCH)/$(1); then \
+	     ln -sf /usr/lib/$(DEB_BUILD_MULTIARCH)/$(1) $(2); \
+	elif test -f /usr/lib/$(1); then \
+	     ln -sf /usr/lib/$(1) $(2) ;\
+	else echo $(1) not found; false ;\
 	fi
+endef
+
+override_dh_auto_build:
+	$(call link_library,libX11.so.6,libX11.so)
 	dh_auto_build
 
 override_dh_clean:
 	dh_clean
-	rm -f libX11.so
+	rm -f *.so
 
 override_dh_auto_install:
 


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




More information about the x2go-commits mailing list