[ogdi-dfsg] 18/19: Add patch to fix install-so-link target.

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Sun Apr 3 00:13:18 UTC 2016


This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository ogdi-dfsg.

commit 94b83e39c8e25006cc05d0e153a882fa2afdf8a1
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Apr 3 01:42:44 2016 +0200

    Add patch to fix install-so-link target.
---
 debian/changelog               |  1 +
 debian/patches/install-so-link | 24 ++++++++++++++++++++++++
 debian/patches/series          |  1 +
 3 files changed, 26 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2101acc..8187f2c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,7 @@ ogdi-dfsg (3.2.0~beta2-8) UNRELEASED; urgency=medium
   * Update copyright file using copyright-format 1.0.
   * Bump Standards-Version to 3.9.7, changes: copyright-format 1.0,
     canonical Vcs-* URLs, mandatory targets in debian/rules.
+  * Add patch to fix install-so-link target.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sat, 02 Apr 2016 21:13:49 +0200
 
diff --git a/debian/patches/install-so-link b/debian/patches/install-so-link
new file mode 100644
index 0000000..ccae394
--- /dev/null
+++ b/debian/patches/install-so-link
@@ -0,0 +1,24 @@
+Description: Fix install-so-link target.
+ Disable mv commands, source and destination are the same file.
+ Disable ln command, symlink already created in default-install target.
+Author: Bas Couwenberg <sebastic at debian.org>
+
+--- a/config/common.mak.in
++++ b/config/common.mak.in
+@@ -257,11 +257,11 @@ default-install:
+ endif
+ 
+ install-so-link:
+-	mv -f $(INST_LIB)/$(LIB_PREFIX)$(TOBEGEN).$(SHLIB_EXT).$(OGDI_MAJOR).$(OGDI_MINOR) $(INST_LIB)
+-	mv -f $(INST_LIB)/$(LIB_PREFIX)$(TOBEGEN).$(SHLIB_EXT).$(OGDI_MAJOR) $(INST_LIB)
+-	cd $(INST_LIB); ln -s $(LIB_PREFIX)$(TOBEGEN).$(SHLIB_EXT).$(OGDI_MAJOR).$(OGDI_MINOR) \
+-	      $(LIB_PREFIX)$(TOBEGEN_STRIPPED).$(SHLIB_EXT) ; \
+-	cd $(CURDIR)
++	#mv -f $(INST_LIB)/$(LIB_PREFIX)$(TOBEGEN).$(SHLIB_EXT).$(OGDI_MAJOR).$(OGDI_MINOR) $(INST_LIB)
++	#mv -f $(INST_LIB)/$(LIB_PREFIX)$(TOBEGEN).$(SHLIB_EXT).$(OGDI_MAJOR) $(INST_LIB)
++	#cd $(INST_LIB); ln -s $(LIB_PREFIX)$(TOBEGEN).$(SHLIB_EXT).$(OGDI_MAJOR).$(OGDI_MINOR) \
++	#      $(LIB_PREFIX)$(TOBEGEN_STRIPPED).$(SHLIB_EXT) ; \
++	#cd $(CURDIR)
+ 
+ install:	default-install $(EXTRA_INSTALL_TARGETS)
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 94219bb..c1e9911 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ hurd
 new_nad_init
 hardening
 spelling-errors
+install-so-link

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/ogdi-dfsg.git



More information about the Pkg-grass-devel mailing list