chiark
/
gitweb
/
~ian
/
chiark-utils.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fishdescriptor: fix error handling
[chiark-utils.git]
/
debian
/
rules
diff --git
a/debian/rules
b/debian/rules
index 792219688b2f01e6669d38ee9533a535888ab541..32f312912b87f42b97d5d3508ceb3bf1d451a772 100755
(executable)
--- a/
debian/rules
+++ b/
debian/rules
@@
-13,29
+13,36
@@
cwd= $(shell pwd)
d= $(cwd)/debian
t= $d/tmp
d= $(cwd)/debian
t= $d/tmp
-build_arch:
- $(checkdir)
- set -e; for s in $(subdirs_build_arch); do $(MAKE) -C $$s all; done
- touch build_arch
+makebuildargs := OPTIMISE= DEBUG= \
+ CMDLINE_CFLAGS="$(shell dpkg-buildflags --get CFLAGS)" \
+ CMDLINE_CPPFLAGS="$(shell dpkg-buildflags --get CPPFLAGS)" \
+ CMDLINE_LDFLAGS="$(shell dpkg-buildflags --get LDFLAGS)"
-build_indep:
+build:
+ $(checkdir)
+ set -e; for s in $(subdirs_build_arch); do \
+ $(MAKE) -C $$s all $(makebuildargs); \
+ done
+ touch build
-build: build_arch build_indep
+build-indep: build
+build-arch: build
clean:
$(checkdir)
rm -f build
clean:
$(checkdir)
rm -f build
- set -e; for s in $(subdirs_build); do \
+ set -e; for s in $(subdirs_build
_arch
); do \
$(MAKE) -C $$s -i distclean || \
$(MAKE) -C $$s -f Makefile.in distclean; \
done
rm -rf *~ debian/tmp debian/*~ debian/files* debian/substvars*
$(MAKE) -C $$s -i distclean || \
$(MAKE) -C $$s -f Makefile.in distclean; \
done
rm -rf *~ debian/tmp debian/*~ debian/files* debian/substvars*
+ rm -rf debian/sv-* debian/*.debhelper.log
binary-prep:
$(checkdir)
rm -rf debian/tmp*
#
binary-prep:
$(checkdir)
rm -rf debian/tmp*
#
- set -e; for s in $(subdirs_build) $(subdirs_nobuild); do \
+ set -e; for s in $(subdirs_build
_arch
) $(subdirs_nobuild); do \
$(MAKE) -C $$s install install-docs install-examples \
prefix=$t/$$s/usr \
etcdir=$t/$$s/etc \
$(MAKE) -C $$s install install-docs install-examples \
prefix=$t/$$s/usr \
etcdir=$t/$$s/etc \
@@
-56,7
+63,7
@@
binary-prep:
$t/$$p/usr/share/doc/$$p/; \
ln -s changelog.gz \
$t/$$p/usr/share/doc/$$p/changelog.Debian.gz; \
$t/$$p/usr/share/doc/$$p/; \
ln -s changelog.gz \
$t/$$p/usr/share/doc/$$p/changelog.Debian.gz; \
- gzip -9v $t/$$p/usr/share/doc/$$p/changelog; \
+ gzip -9v
n
$t/$$p/usr/share/doc/$$p/changelog; \
done
#
install -d $t/chiark-rwbuffer/usr/bin
done
#
install -d $t/chiark-rwbuffer/usr/bin
@@
-84,10
+91,9
@@
binary-prep:
mv really.8 $t/chiark-really/usr/share/man/man8/
rm $t/chiark-utils-bin/usr/sbin/trivsoundd \
$t/chiark-utils-bin/usr/share/man/man8/trivsoundd.8
mv really.8 $t/chiark-really/usr/share/man/man8/
rm $t/chiark-utils-bin/usr/sbin/trivsoundd \
$t/chiark-utils-bin/usr/share/man/man8/trivsoundd.8
- rmdir $t/chiark-utils-bin/usr/sbin \
- $t/chiark-utils-bin/usr/share/man/man8
+ rmdir $t/chiark-utils-bin/usr/sbin
#
#
- gzip -9f $t/*/usr/share/man/man*/*
+ gzip -9f
n
$t/*/usr/share/man/man*/*
binary-hook-chiark-backup:
binary-hook-chiark-rwbuffer:
binary-hook-chiark-backup:
binary-hook-chiark-rwbuffer:
@@
-102,7
+108,8
@@
binary-one:
cp debian/$p/$$f $t/$p/DEBIAN/$$f; \
chmod u=rwX,go=rX $t/$p/DEBIAN/$$f; \
done
cp debian/$p/$$f $t/$p/DEBIAN/$$f; \
chmod u=rwX,go=rX $t/$p/DEBIAN/$$f; \
done
- dpkg-gencontrol -isp -p$p -P$t/$p -Tdebian/sv-$p
+ dh_link -p$p -Pdebian/tmp/$p
+ dpkg-gencontrol -p$p -P$t/$p -Tdebian/sv-$p
chown -R root.root debian/tmp
chmod -R g-ws debian/tmp
debian/rules binary-hook-$p
chown -R root.root debian/tmp
chmod -R g-ws debian/tmp
debian/rules binary-hook-$p
@@
-122,19
+129,15
@@
binary-arch: checkroot build binary-prep
$t/chiark-really/usr/sbin/*
set -e; for f in $t/chiark-utils-bin/usr/bin/*; do \
case "$$f" in \
$t/chiark-really/usr/sbin/*
set -e; for f in $t/chiark-utils-bin/usr/bin/*; do \
case "$$f" in \
- */xacpi-simple) d=Suggests ;; \
- */watershed|*/summer) d=Recommends ;; \
+ */xbatmon-simple|*/xduplic-copier) \
+ d=Suggests ;; \
+ */watershed|*/summer|*/cgi-fcgi-interp) \
+ d=Recommends ;; \
*) d=Depends ;; \
esac; \
a="$$a -d$$d $$f"; \
done; set -x; \
dpkg-shlibdeps -Tdebian/sv-chiark-utils-bin $$a
*) d=Depends ;; \
esac; \
a="$$a -d$$d $$f"; \
done; set -x; \
dpkg-shlibdeps -Tdebian/sv-chiark-utils-bin $$a
- perl -i~ -pe ' '\
- -e' next unless m/^shlibs:/; '\
- -e' s/$$/,/; s/=/=, /; '\
- -e' s/, libgmp3(?:c2)?,/, libgmp3 | libgmp3c2,/; '\
- -e' s/=, /=/; s/,$$//; '\
- debian/sv-*[!~]
set -e; for p in $(packages_arch); \
do debian/rules binary-one p=$$p; done
set -e; for p in $(packages_arch); \
do debian/rules binary-one p=$$p; done