summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCecil Hugh Watson <knoppmyth@gmail.com>2009-10-05 05:09:13 (GMT)
committerCecil Hugh Watson <knoppmyth@gmail.com>2009-10-05 05:09:13 (GMT)
commit7fd0493cded61ebcf8f7b93571956472801c83a7 (patch)
treea9bbdc5931a2e2bc7cca4299bb868b04aedc0a88
parent88b8d0f2715757c575b86bc6c86d4c70ba8f050d (diff)
downloadlinhes_pkgbuild-7fd0493cded61ebcf8f7b93571956472801c83a7.zip
linhes_pkgbuild-7fd0493cded61ebcf8f7b93571956472801c83a7.tar.gz
linhes_pkgbuild-7fd0493cded61ebcf8f7b93571956472801c83a7.tar.bz2
libjpeg6:Modified install to add /opt/libjpeg6/lib instead of include.
-rw-r--r--abs/core-testing/libjpeg6/PKGBUILD2
-rw-r--r--abs/core-testing/libjpeg6/libjpeg6.install24
2 files changed, 9 insertions, 17 deletions
diff --git a/abs/core-testing/libjpeg6/PKGBUILD b/abs/core-testing/libjpeg6/PKGBUILD
index 098b6b7..659aaf6 100644
--- a/abs/core-testing/libjpeg6/PKGBUILD
+++ b/abs/core-testing/libjpeg6/PKGBUILD
@@ -3,7 +3,7 @@
# Committer: Judd Vinet <jvinet@zeroflux.org>
pkgname=libjpeg6
pkgver=6b
-pkgrel=10
+pkgrel=11
pkgdesc="Library of JPEG support functions"
arch=('i686' 'x86_64')
url="http://ijg.org"
diff --git a/abs/core-testing/libjpeg6/libjpeg6.install b/abs/core-testing/libjpeg6/libjpeg6.install
index 9ad4afe..0d3173d 100644
--- a/abs/core-testing/libjpeg6/libjpeg6.install
+++ b/abs/core-testing/libjpeg6/libjpeg6.install
@@ -1,25 +1,17 @@
# arg 1: the new package version
post_install() {
- if grep -q libjpeg6 /etc/ld.so.conf
- then
- exit
- else
- echo "/opt/libjpeg6/include" >> /etc/ld.so.conf
- ldconfig
- fi
- ln -s /opt/libjpeg6/lib/libjpeg.so.62 /usr/lib/libjpeg.so.62
+ grep -v libjpeg6 /etc/ld.so.conf > /tmp/ld.so.conf
+ mv /tmp/ld.so.conf /etc/ld.so.conf
+ echo "/opt/libjpeg6/lib" >> /etc/ld.so.conf
+ ldconfig
}
# arg 1: the new package version
# arg 2: the old package version
post_upgrade() {
- if grep -q libjpeg6 /etc/ld.so.conf
- then
- exit
- else
- echo "/opt/libjpeg6/include" >> /etc/ld.so.conf
- ldconfig
- fi
- ln -sf /opt/libjpeg6/lib/libjpeg.so.62 /usr/lib/libjpeg.so.62
+ grep -v libjpeg6 /etc/ld.so.conf > /tmp/ld.so.conf
+ mv /tmp/ld.so.conf /etc/ld.so.conf
+ echo "/opt/libjpeg6/lib" >> /etc/ld.so.conf
+ ldconfig
}
# arg 1: the old package version
post_remove() {