Author: aurel32
Date: 2009-09-08 19:52:02 +0000 (Tue, 08 Sep 2009)
New Revision: 3818
Modified:
glibc-package/trunk/debian/debhelper.in/libc-pic.dirs
glibc-package/trunk/debian/rules.d/build.mk
glibc-package/trunk/debian/rules.d/debhelper.mk
Log:
More merge from the multiarch branch
Modified: glibc-package/trunk/debian/debhelper.in/libc-pic.dirs
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc-pic.dirs 2009-09-08
19:47:21 UTC (rev 3817)
+++ glibc-package/trunk/debian/debhelper.in/libc-pic.dirs 2009-09-08
19:52:02 UTC (rev 3818)
@@ -1 +1 @@
-usr/lib/libc_pic
+LIBDIR/libc_pic
Modified: glibc-package/trunk/debian/rules.d/build.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/build.mk 2009-09-08 19:47:21 UTC (rev
3817)
+++ glibc-package/trunk/debian/rules.d/build.mk 2009-09-08 19:52:02 UTC (rev
3818)
@@ -138,7 +138,7 @@
OUT=debian/tmp-$(curpass)/usr/share/i18n/SUPPORTED; \
fi
- # Create the multidir directories, and the configuration file in
/etc/ld.so.conf.d
+ # Create the multiarch directories, and the configuration file in
/etc/ld.so.conf.d
if [ $(curpass) = libc ]; then \
mkdir -p debian/tmp-$(curpass)/etc/ld.so.conf.d; \
machine=`sed '/^ *config-machine *=/!d;s/.*= *//g'
$(DEB_BUILDDIR)/config.make`; \
Modified: glibc-package/trunk/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/debhelper.mk 2009-09-08 19:47:21 UTC
(rev 3817)
+++ glibc-package/trunk/debian/rules.d/debhelper.mk 2009-09-08 19:52:02 UTC
(rev 3818)
@@ -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
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
