# # # patch "debian/rules" # from [94f668db9b7ede39bbb218923fb6f5007a9a4d3a] # to [f2ebc53ecde8765a6d05d615a25ff757c51f441a] # ============================================================ --- debian/rules 94f668db9b7ede39bbb218923fb6f5007a9a4d3a +++ debian/rules f2ebc53ecde8765a6d05d615a25ff757c51f441a @@ -77,7 +77,6 @@ endif cp -f /usr/share/misc/config.guess config.guess endif ./configure $(BUILD_AND_HOST) \ - --with-system-pcre \ --prefix=/usr --mandir='$${prefix}/share/man' \ --infodir='$${prefix}/share/info' CFLAGS="$(CFLAGS)" \ CXXFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" @@ -94,7 +93,7 @@ build-arch-stamp: config.status # over local domain sockets, coming Real Soon Now from upstream. build-arch: build-arch-stamp build-arch-stamp: config.status - make $(PAR) -C po all + make $(PAR) all-local make $(PAR) mtn mtnopt ifeq "$(findstring nocheck, $(DEB_BUILD_OPTIONS))" "" make $(PAR) unit_tester tester check_net @@ -189,7 +188,7 @@ binary-arch: build-arch # # N.B. DEB_BUILD_OPTIONS=nostrip is handled entirely within dh_strip. $(MAKE) DESTDIR=$(shell pwd)/debian/monotone install-exec-am - $(MAKE) DESTDIR=$(shell pwd)/debian/monotone -C po install-data + $(MAKE) DESTDIR=$(shell pwd)/debian/monotone install-data-local # dh_installdirs created etc/bash_completion.d. dh_install cannot install # a file under a different basename.