r3815 - in glibc-package/branches/multiarch/debian: debhelper.in rules.d
Author: aurel32
Date: 2009-09-08 13:31:37 +0000 (Tue, 08 Sep 2009)
New Revision: 3815
Modified:
glibc-package/branches/multiarch/debian/debhelper.in/libc-pic.dirs
glibc-package/branches/multiarch/debian/rules.d/debhelper.mk
Log:
Install libc6-pic files at the correct location
Modified: glibc-package/branches/multiarch/debian/debhelper.in/libc-pic.dirs
===================================================================
--- glibc-package/branches/multiarch/debian/debhelper.in/libc-pic.dirs 2009-09-08 06:24:56 UTC (rev 3814)
+++ glibc-package/branches/multiarch/debian/debhelper.in/libc-pic.dirs 2009-09-08 13:31:37 UTC (rev 3815)
@@ -1 +1 @@
-usr/lib/libc_pic
+LIBDIR/libc_pic
Modified: glibc-package/branches/multiarch/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/branches/multiarch/debian/rules.d/debhelper.mk 2009-09-08 06:24:56 UTC (rev 3814)
+++ glibc-package/branches/multiarch/debian/rules.d/debhelper.mk 2009-09-08 13:31:37 UTC (rev 3815)
@@ -6,15 +6,15 @@
@echo Running special kludge for $(libc)-pic
dh_testroot
dh_installdirs -p$(curpass)
- install --mode=0644 build-tree/$(DEB_HOST_ARCH)-libc/libc_pic.a debian/$(libc)-pic/usr/lib/.
- install --mode=0644 build-tree/$(DEB_HOST_ARCH)-libc/libc.map debian/$(libc)-pic/usr/lib/libc_pic.map
- install --mode=0644 build-tree/$(DEB_HOST_ARCH)-libc/elf/soinit.os debian/$(libc)-pic/usr/lib/libc_pic/soinit.o
- install --mode=0644 build-tree/$(DEB_HOST_ARCH)-libc/elf/sofini.os debian/$(libc)-pic/usr/lib/libc_pic/sofini.o
+ install --mode=0644 build-tree/$(DEB_HOST_ARCH)-libc/libc_pic.a debian/$(libc)-pic/$(libdir)/.
+ install --mode=0644 build-tree/$(DEB_HOST_ARCH)-libc/libc.map debian/$(libc)-pic/$(libdir)/libc_pic.map
+ install --mode=0644 build-tree/$(DEB_HOST_ARCH)-libc/elf/soinit.os debian/$(libc)-pic/$(libdir)/libc_pic/soinit.o
+ install --mode=0644 build-tree/$(DEB_HOST_ARCH)-libc/elf/sofini.os debian/$(libc)-pic/$(libdir)/libc_pic/sofini.o
- install --mode=0644 build-tree/$(DEB_HOST_ARCH)-libc/math/libm_pic.a debian/$(libc)-pic/usr/lib/.
- install --mode=0644 build-tree/$(DEB_HOST_ARCH)-libc/libm.map debian/$(libc)-pic/usr/lib/libm_pic.map
- install --mode=0644 build-tree/$(DEB_HOST_ARCH)-libc/resolv/libresolv_pic.a debian/$(libc)-pic/usr/lib/.
- install --mode=0644 build-tree/$(DEB_HOST_ARCH)-libc/libresolv.map debian/$(libc)-pic/usr/lib/libresolv_pic.map
+ install --mode=0644 build-tree/$(DEB_HOST_ARCH)-libc/math/libm_pic.a debian/$(libc)-pic/$(libdir)/.
+ install --mode=0644 build-tree/$(DEB_HOST_ARCH)-libc/libm.map debian/$(libc)-pic/$(libdir)/libm_pic.map
+ install --mode=0644 build-tree/$(DEB_HOST_ARCH)-libc/resolv/libresolv_pic.a debian/$(libc)-pic/$(libdir).
+ install --mode=0644 build-tree/$(DEB_HOST_ARCH)-libc/libresolv.map debian/$(libc)-pic/$(libdir)/libresolv_pic.map
# Some per-package extra files to install.
define libc-bin_extra_debhelper_pkg_install
Reply to: