-iconic <= -icon; changelog; compile

[chiark-utils.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index bee06b08f1d641db64db7c9c22f8365b62d888fb..be4c926337251bc3871b8999b00c838d28c4026c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -13,19 +13,18 @@ cwd=        $(shell pwd)
 d=     $(cwd)/debian
 t=     $d/tmp
 
-build-arch:
+build:
        $(checkdir)
        set -e; for s in $(subdirs_build_arch); do $(MAKE) -C $$s all; done
-       touch build_arch
+       touch build
 
-build-indep:
-
-build: build-arch build-indep
+build-indep: build
+build-arch: 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
@@ -35,7 +34,7 @@ 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 \