← Back to branch summary

~ubuntu-branches/ubuntu/saucy/imagemagick/saucy-security

« back to all changes in this revision

Viewing changes to debian/rules

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose
  • Date: 2011-03-16 02:02:30 UTC
  • Revision ID: james.westby@ubuntu.com-20110316020230-af7i20zfqusb6p7p
Tags: 7:6.6.2.6-1ubuntu4
Don't set MAKEFLAGS in debian/rules. just pass it to the build.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/rules
14
14
 
15
15
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
16
16
NUMJOBS := $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
17
 
MAKEFLAGS += -j$(NUMJOBS)
 
17
UPSTREAM_MAKEFLAGS += -j$(NUMJOBS)
18
18
endif
19
19
 
20
20
build: build-stamp
49
49
                -e 's/^hardcode_libdir_flag_spec.*$$/hardcode_libdir_flag_spec=" -D__LIBTOOL_IS_A_FOOL__ "/' \
50
50
                -e '/^archive_cmds="/s/"$$/ \\$$deplibs"/'
51
51
 
52
 
        $(MAKE)
 
52
        $(MAKE) $(UPSTREAM_MAKEFLAGS)
53
53
 
54
54
        cd "$(CURDIR)/PerlMagick" && \
55
55
                $(MAKE)
68
68
        @if test "$(DEB_HOST_GNU_TYPE)" = "$(DEB_BUILD_GNU_TYPE)"; then \
69
69
                unset DISPLAY; \
70
70
                LD_LIBRARY_PATH="$(CURDIR)/magick/.libs:$(CURDIR)/wand/.libs:$(CURDIR)/Magick++/lib/.libs:$$LD_LIBRARY_PATH" \
71
 
                $(MAKE) check LD_RUN_PATH= && echo "*** Testsuite succeeded ***" || echo "*** Testsuite failed ***"; \
 
71
                $(MAKE) $(UPSTREAM_MAKEFLAGS) check LD_RUN_PATH= && echo "*** Testsuite succeeded ***" || echo "*** Testsuite failed ***"; \
72
72
                cat test-suite.log; \
73
73
        else \
74
74
                echo "Skipping regression tests because we appear to be cross-compiling"; \