On Sat, Oct 11, 2014 at 12:03:14PM +0200, Werner LEMBERG wrote: > Colin Watson wrote: > > I tried running a test "make dist", importing that into my Debian > > packaging branch, and building. This failed because > > src/utils/xtotroff was missing. On looking back I see this in the > > configure output from before "make dist": > > > > configure: gxditview and xtotroff won't be built > > > > I think it would be a good idea to make sure that these directories > > are present regardless of configuration. > > OK. Can you provide a patch, please?
How about the attached? -- Colin Watson [cjwat...@debian.org]
diff --git a/ChangeLog b/ChangeLog index 19aa0b9..5c8429a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2014-10-15 Colin Watson <cjwat...@debian.org> + + Always distribute the parts of groff that require X11. + + * Makefile.in (ALLLIBDIRS): Clone from `LIBDIRS', but include + src/devices/libxutil unconditionally. + (ALLPROGDIRS): Clone from `PROGDIRS', but include + src/devices/xditview and src/utils/xtotroff unconditionally. + (DISTDIRS): Use `ALLLIBDIRS' and `ALLPROGDIRS' rather than `LIBDIRS' + and `PROGDIRS'. + 2014-10-14 Keith Marshall <keith.d.marsh...@ntlworld.com> Minor update to NEWS for pdfroff. diff --git a/Makefile.in b/Makefile.in index 139d7cb..4dd82ef 100644 --- a/Makefile.in +++ b/Makefile.in @@ -625,6 +625,11 @@ LIBDIRS=\ src/libs/libdriver \ src/libs/libbib \ $(XLIBDIRS) +ALLLIBDIRS=\ + src/libs/libgroff \ + src/libs/libdriver \ + src/libs/libbib \ + src/libs/libxutil CCPROGDIRS=\ src/roff/groff \ src/roff/troff \ @@ -660,6 +665,13 @@ PROGDIRS=\ $(CPROGDIRS) \ $(SHPROGDIRS) \ $(XPROGDIRS) +ALLPROGDIRS=\ + $(PROGDEPDIRS) \ + $(CCPROGDIRS) \ + $(CPROGDIRS) \ + $(SHPROGDIRS) \ + src/devices/xditview \ + src/utils/xtotroff DEVDIRS=\ font/devps \ font/devdvi \ @@ -735,8 +747,8 @@ GNULIBDIRS=\ src/libs/gnulib DISTDIRS=\ $(INCDIRS) \ - $(LIBDIRS) \ - $(PROGDIRS) \ + $(ALLLIBDIRS) \ + $(ALLPROGDIRS) \ $(DEVDIRS) \ $(XDEVDIRS) \ $(OTHERDEVDIRS) \
