diff options
Diffstat (limited to 'debian/rules')
-rwxr-xr-x | debian/rules | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/debian/rules b/debian/rules index e083ab35..668ecb2e 100755 --- a/debian/rules +++ b/debian/rules @@ -43,9 +43,9 @@ endif ifeq ($(DEB_HOST_ARCH_OS),illumos) CPPFLAGS = "-DBYTE_ORDER=LITTLE_ENDIAN -DLITTLE_ENDIAN=1234 -D__sighandler_t=sighandler_t -Difr_hwaddr=ifr_addr -DNGROUPS=NGROUPS_MAX" # /bin is a symlink to /usr/bin: -CONFOPTS += --bindir=/usr/bin -CONFOPTS += --sbindir=/usr/sbin -CONFOPTS += --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) +CONFOPTS += --prefix=/usr +CONFOPTS += --sbindir=\$${prefix}/sbin +CONFOPTS += --libdir=/lib/$(DEB_HOST_MULTIARCH) # No /proc/partitions on Illumos/Solaris: CONFOPTS += --disable-libblkid CONFOPTS += --disable-mount @@ -83,8 +83,10 @@ install: build dh_installdirs $(MAKE) install DESTDIR=`pwd`/debian/util-linux INSTALL_STRIP_FLAG="" dh_installdocs -i -s +ifneq ($(DEB_HOST_ARCH_OS),illumos) install -m 644 login-utils/README.modems-with-agetty debian/util-linux/usr/share/doc/util-linux/README.modems-with-agetty install -m 755 debian/util-linux.initramfs debian/util-linux/usr/share/initramfs-tools/hooks/utillinux +endif dh_installexamples -i -s dh_installmenu -i -s dh_installcron -i -s @@ -96,8 +98,8 @@ install: build ifeq ($(DEB_HOST_ARCH_OS),linux) mv debian/util-linux/usr/sbin/*part* debian/util-linux/usr/bin mv debian/util-linux/usr/bin/cytune debian/util-linux/usr/sbin -endif mv debian/util-linux/usr/bin/tailf debian/util-linux/bin +endif mv debian/util-linux/usr/bin/isosize debian/util-linux/sbin mv debian/util-linux/usr/share/man/man8/linux32.8 debian/util-linux/usr/share/man/man1/linux32.1 mv debian/util-linux/usr/share/man/man8/linux64.8 debian/util-linux/usr/share/man/man1/linux64.1 @@ -136,6 +138,7 @@ endif install -m 644 debian/hwclock.rules debian/util-linux/lib/udev/rules.d/85-hwclock.rules; \ install -m 755 debian/hwclock-set debian/util-linux/lib/udev/hwclock-set; \ fi +ifneq ($(DEB_HOST_ARCH_OS),illumos) # copy blkid library and symlink into udeb ln debian/libblkid1/lib/libblkid.so.1.* debian/libblkid1-udeb/lib/ ln debian/libblkid1/lib/libblkid.so.1 debian/libblkid1-udeb/lib/ @@ -143,9 +146,10 @@ endif # overwrite copyright install -m 644 debian/libblkid.copyright debian/libblkid1/usr/share/doc/libblkid1/copyright install -m 644 debian/libblkid.copyright debian/libblkid-dev/usr/share/doc/libblkid-dev/copyright +endif # copy uuid library and symlink into udeb - ln debian/libuuid1/lib/libuuid.so.1.* debian/libuuid1-udeb/lib/ - ln debian/libuuid1/lib/libuuid.so.1 debian/libuuid1-udeb/lib/ + ln debian/libuuid1/lib/$(DEB_HOST_MULTIARCH)/libuuid.so.1.* debian/libuuid1-udeb/lib/ + ln debian/libuuid1/lib/$(DEB_HOST_MULTIARCH)/libuuid.so.1 debian/libuuid1-udeb/lib/ # overwrite copyright install -m 644 debian/libuuid.copyright debian/libuuid1/usr/share/doc/libuuid1/copyright install -m 644 debian/libuuid.copyright debian/uuid-dev/usr/share/doc/uuid-dev/copyright @@ -154,8 +158,8 @@ endif cd debian; if [ -f util-linux/sbin/fdisk ]; then \ ln util-linux/sbin/*fdisk fdisk-udeb/usr/sbin/; \ S=fdisk-udeb/usr/sbin/cfdisk; if [ -f $$S ]; then mv $$S cfdisk-udeb/usr/sbin/; fi; \ + cd util-linux-locales && find usr/share/locale -type f | while read x; do ln $$x ../cfdisk-udeb/$$x; done \ fi - cd debian/util-linux-locales && find usr/share/locale -type f | while read x; do ln $$x ../cfdisk-udeb/$$x; done ifeq ($(DEB_HOST_ARCH_OS),linux) install -m 644 debian/mount.fstab debian/mount/usr/share/doc/mount/examples/fstab ifeq ($(arch),$(findstring $(arch),powerpc ppc64)) @@ -165,11 +169,11 @@ else cd debian/util-linux && if [ -f sbin/hwclock ] ; then ln -sf hwclock.8.gz usr/share/man/man8/clock.8.gz; fi endif endif -ifneq ($(DEB_HOST_ARCH_OS),hurd) +ifeq (,$(findstring $(DEB_HOST_ARCH_OS),hurd illumos)) cd debian/util-linux/sbin ; ln agetty getty cd debian/util-linux/usr/share/man/man8 ; ln agetty.8 getty.8 endif -ifneq ($(DEB_HOST_ARCH_OS),linux) +ifeq (,$(findstring $(DEB_HOST_ARCH_OS),linux illumos)) cd debian/util-linux/sbin ; mv mkswap mkswap.linux cd debian/util-linux/usr/share/man/man8 ; mv mkswap.8 mkswap.linux.8 endif |