diff options
| author | Clint Adams <clint@debian.org> | 2016-02-11 18:32:48 -0500 |
|---|---|---|
| committer | Clint Adams <clint@debian.org> | 2016-02-11 19:29:55 -0500 |
| commit | 34210066987c473e895e5bab397f82c2601cdcf2 (patch) | |
| tree | 66181ddddde3f677443408d2c9cb487a5875652a | |
| parent | fef7c3a248fad7cf05ab117395806f1aaa21f51b (diff) | |
Be consistent with use of 'tmpdir'
| -rwxr-xr-x | debian/rules | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/debian/rules b/debian/rules index 1fdb5c6..1e97a7c 100755 --- a/debian/rules +++ b/debian/rules @@ -51,7 +51,7 @@ endif clean: rm -f debian/substvars debian/files build-arch config.log config.cache rm -f build-aux/config.guess build-aux/config.sub - rm -rf debian/tmp autom4te.cache + rm -rf $(tmpdir) autom4te.cache find . -type f -a \( -name \#\*\# -o -name .\*\~ -o -name \*\~ -o -name DEADJOE -o -name \*.orig -o -name \*.rej -o -name \*.bak -o -name .\*.orig -o -name .\*.rej -o -name .SUMS -o -name TAGS -o -name core -o \( -path \*/.deps/\* -a -name \*.P \) \) -exec rm -f {} \; test ! -f Makefile || $(MAKE) distclean @@ -76,18 +76,16 @@ binary: binary-indep binary-arch binary-indep: binary-arch: build checkroot - -rm -rf debian/tmp debian/files debian/substvars + -rm -rf $(tmpdir) debian/files debian/substvars install -d -o root -g root -m 755 $(tmpdir)$(docdir)/examples # Install sed - $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install + $(MAKE) DESTDIR=$(tmpdir) install ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) $(STRIP) --remove-section=.comment --remove-section=.note \ - --strip-unneeded debian/tmp/bin/sed + --strip-unneeded $(tmpdir)/bin/sed endif rm -f $(tmpdir)/usr/share/info/dir* -# mv $(tmpdir)/usr/share/doc/sed-4.1.5 $(tmpdir)$(docdir) -# mv $(tmpdir)/usr/share/doc/sed.html $(tmpdir)$(docdir)/ gzip -9n $(tmpdir)/usr/share/man/man1/* gzip -9n $(tmpdir)/usr/share/info/sed.info* @@ -106,16 +104,16 @@ endif # Install Debian-specific stuff install -d -o root -g root -m 755 $(tmpdir)/DEBIAN - cd debian/tmp && find * -type f ! -regex '^DEBIAN/.*' -print0 | xargs -r0 md5sum > DEBIAN/md5sums + cd $(tmpdir) && find * -type f ! -regex '^DEBIAN/.*' -print0 | xargs -r0 md5sum > DEBIAN/md5sums # Build the package find $(tmpdir) ! -type l -print0 | xargs -0r chmod go=rX,u+rw,a-s dpkg-shlibdeps -dPre-Depends $(tmpdir)/bin/sed dpkg-gencontrol -isp - find debian/tmp -depth -newermt '$(BUILD_DATE)' -print0 | \ + find $(tmpdir) -depth -newermt '$(BUILD_DATE)' -print0 | \ xargs -0r touch --no-dereference --date='$(BUILD_DATE)' - dpkg --build debian/tmp .. + dpkg --build $(tmpdir) .. checkroot: test root = "`whoami`" |