summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Pashev <pashev.igor@gmail.com>2012-09-05 02:50:08 +0000
committerIgor Pashev <pashev.igor@gmail.com>2012-09-05 02:50:08 +0000
commit6b7191424a48dd861cff313dcfde71747c4709c2 (patch)
tree5e739af21eae3cb80242144aacd510557cad5b8b
parentf40d2d332da8443916cab0c4e2edb06b94652e79 (diff)
downloadlibelf-6b7191424a48dd861cff313dcfde71747c4709c2.tar.gz
Move all under /usr
-rw-r--r--debian/changelog6
-rwxr-xr-xdebian/rules7
2 files changed, 7 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog
index da652ca..86e8a68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libelf (0.8.13-6) unstable; urgency=low
+
+ * Move all under /usr. This libelf is not suitable for illumos ld.so.1
+
+ -- Igor Pashev <pashev.igor@gmail.com> Wed, 05 Sep 2012 02:46:55 +0000
+
libelf (0.8.13-5) unstable; urgency=low
* Don't conflict with libelf-dev, until we rebuild libc
diff --git a/debian/rules b/debian/rules
index 75fcb3d..0fe9e99 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,12 +6,7 @@ include /usr/share/dpkg/architecture.mk
multi_CC := -m32
multi_libdir := /usr/lib32
-ifeq (illumos,$(DEB_HOST_ARCH_OS))
- # runtime linker used to be dynamically linked to libelf:
- libdir := /lib/$(DEB_HOST_MULTIARCH)
-else
- libdir := /usr/lib/$(DEB_HOST_MULTIARCH)
-endif
+libdir := /usr/lib/$(DEB_HOST_MULTIARCH)
%:
dh $@