GNOME Bugzilla – Bug 705455
po/Makefile.in.in should not be customized
Last modified: 2013-12-22 23:22:38 UTC
Created attachment 250811 [details] [review] po.patch po/Makefile.in.in is replaced whenever one autoreconfs The only difference is the addition of: GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ You should not do this in a file that will get replaced automatically with autoreconfing. Instead, place this inside of your Makevars which isn't clobbered on autoreconf. You should rename Makevars to Makevars.in, add that line, and then add po/Makevars to configure.ac's list of files to generate. Patch is provided
Great, thanks for that, finally we can get rid of that ugly hack.
Created attachment 263693 [details] [review] Generate Makevars with the right GETTEXT_PACKAGE name Just to confirm, this is the patch we want to apply ?
Yes, but it breaks "make distcheck". I have a fix
Or maybe not. What needs to be done is that Makevars.in is shipped (DISTFILES += Makevars.in in Makevars.in). And also Makevars should not be shipped, and cleaned by "make distclean". However the "make distclean" part does not seem to be possible with the Makefiles generated by autopoint.
Fixed this differently now, by just setting domain explicitly in po/Makevars without generating the file from the stuff in configure.ac. Not ideal, but seems like the least worst option to me.