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
cgi-fcgi-interp: Do not eat an option in squashed arg style
[chiark-utils.git]
/
debian
/
rules
diff --git
a/debian/rules
b/debian/rules
index bf733424c131944f2a3c35b303d2928eec118fe1..35d00fe56d3b90872ac4b0cc84fa1701dc89fb2f 100755
(executable)
--- a/
debian/rules
+++ b/
debian/rules
@@
-13,9
+13,16
@@
cwd= $(shell pwd)
d= $(cwd)/debian
t= $d/tmp
d= $(cwd)/debian
t= $d/tmp
+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:
$(checkdir)
build:
$(checkdir)
- set -e; for s in $(subdirs_build_arch); do $(MAKE) -C $$s all; done
+ set -e; for s in $(subdirs_build_arch); do \
+ $(MAKE) -C $$s all $(makebuildargs); \
+ done
touch build
build-indep: build
touch build
build-indep: build
@@
-24,17
+31,18
@@
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 \
@@
-83,8
+91,7
@@
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 $t/*/usr/share/man/man*/*
@@
-101,6
+108,7
@@
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
+ dh_link -p$p -Pdebian/tmp/$p
dpkg-gencontrol -isp -p$p -P$t/$p -Tdebian/sv-$p
chown -R root.root debian/tmp
chmod -R g-ws debian/tmp
dpkg-gencontrol -isp -p$p -P$t/$p -Tdebian/sv-$p
chown -R root.root debian/tmp
chmod -R g-ws debian/tmp
@@
-121,7
+129,8
@@
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 ;; \
+ */xbatmon-simple|*/xduplic-copier) \
+ d=Suggests ;; \
*/watershed|*/summer) d=Recommends ;; \
*) d=Depends ;; \
esac; \
*/watershed|*/summer) d=Recommends ;; \
*) d=Depends ;; \
esac; \