diff options
author | Igor Pashev <pashev.igor@gmail.com> | 2012-07-03 17:23:49 +0000 |
---|---|---|
committer | Igor Pashev <pashev.igor@gmail.com> | 2012-07-03 17:23:49 +0000 |
commit | d41f0dcff5d1aa9ab79ba12adea477d36b1fa401 (patch) | |
tree | 1f1175dc1452c9cb1fd85a489b6d08e8f2289e4d /debian | |
parent | 432757084368cf73cb91737a600716138b927d50 (diff) | |
download | debianutils-d41f0dcff5d1aa9ab79ba12adea477d36b1fa401.tar.gz |
All in /usr/bin
Diffstat (limited to 'debian')
-rwxr-xr-x | debian/rules | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/debian/rules b/debian/rules index 6256fd2..f1cc029 100755 --- a/debian/rules +++ b/debian/rules @@ -52,7 +52,6 @@ binary-arch: checkroot build $(checkdir) -rm -rf debian/tmp $(INSTALL_DIR) debian/tmp/DEBIAN \ - debian/tmp/bin \ debian/tmp/sbin \ debian/tmp/usr/bin \ debian/tmp/usr/sbin \ @@ -61,21 +60,14 @@ binary-arch: checkroot build debian/tmp/usr/share/doc/$(package) \ debian/tmp/usr/share/$(package) $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp INSTALL_PROGRAM="$(INSTALL_PROGRAM)" - mv debian/tmp/usr/bin/run-parts \ - debian/tmp/usr/bin/tempfile \ - debian/tmp/usr/bin/which \ - debian/tmp/bin/ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) $(STRIP) --remove-section=.comment --remove-section=.note \ - debian/tmp/bin/run-parts \ - debian/tmp/bin/tempfile \ + debian/tmp/usr/bin/run-parts \ + debian/tmp/usr/bin/tempfile \ debian/tmp/usr/bin/ischroot endif -ifneq ($(DEB_HOST_ARCH_OS),hurd) - ln -s /bin/which debian/tmp/usr/bin/which -endif ifeq ($(DEB_HOST_ARCH_OS),linux) mv debian/tmp/usr/sbin/installkernel debian/tmp/sbin/ else @@ -97,8 +89,8 @@ endif cd debian/tmp && find * -type f ! -regex '^DEBIAN/.*' -print0 | xargs -r0 md5sum > DEBIAN/md5sums - dpkg-shlibdeps debian/tmp/bin/run-parts \ - debian/tmp/bin/tempfile \ + dpkg-shlibdeps debian/tmp/usr/bin/run-parts \ + debian/tmp/usr/bin/tempfile \ debian/tmp/usr/bin/ischroot dpkg-gencontrol -isp dpkg --build debian/tmp .. |