From: Dave Chinner Date: Tue, 18 Jun 2013 03:40:53 +0000 (+1000) Subject: xfsprogs: fix make deb X-Git-Tag: v3.2.0-alpha1~134 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a70f64c02a0ba24f81c8de241084118af68454a;p=thirdparty%2Fxfsprogs-dev.git xfsprogs: fix make deb Commit 48212a30 ("xfsprogs: update 'make deb' to use tarball) fixed a bunch of problems with making the source tarball for releases. However, it broke the debian package builds in a way I hadn't noticed until I rewrote my CI system build script. I noticed that the CI system wasn't building from a pristine workarea, and instead was just updating the old workarea and running 'make deb'. I added a 'make realclean' to remove all previous state from the workarea, and then 'make deb' started failing with errors building the tarball because po/xfsprogs.pot didn't have a build rule The above commit removed the pre-build of the translations target, and instead made the translation build target a dependency of building the the tarball. Hence the lack of a build rule of the translations causes the source tarball build to fail. Signed-off-by: Dave Chinner Reviewed-by: Ben Myers Signed-off-by: Ben Myers --- diff --git a/Makefile b/Makefile index b73bb576e..f56aebd9c 100644 --- a/Makefile +++ b/Makefile @@ -135,6 +135,8 @@ deb: include/builddefs include/platform_defs.h ifeq ($(HAVE_BUILDDEFS), no) $(Q)$(MAKE) $(MAKEOPTS) -C . $@ else + # need to build translations before the source tarball + $(Q)$(MAKE) $(MAKEOPTS) -C po $(Q)$(MAKE) $(MAKEOPTS) $(SRCDIR) $(Q)cd $(SRCDIR) && dpkg-buildpackage endif