[Groff] BuildFoundries mistakenly installed?

[Colin Watson]

I was looking through Debian's groff packaging to see what could
usefully be simplified given some upstream changes.  At the moment I
have a custom rule to make $(datadir)/font/devpdf/util/BuildFoundries
executable, since it has a #! line, and I was going to apply this to
master to fix that for everyone:

diff --git a/font/devpdf/devpdf.am b/font/devpdf/devpdf.am
index 067da3fd..3e125694 100644
--- a/font/devpdf/devpdf.am
+++ b/font/devpdf/devpdf.am
@@ -50,7 +50,7 @@ DEVPDFFONTMAP_2 = font/devpdf/map/symbolmap
 devpdffontmap_DATA = $(DEVPDFFONTMAP_1) $(DEVPDFFONTMAP_2)

 devpdffontutildir = $(devpdffontdir)/util
-nodist_devpdffontutil_DATA = font/devpdf/util/BuildFoundries
+nodist_devpdffontutil_SCRIPTS = font/devpdf/util/BuildFoundries

 EXTRA_DIST += \
   font/devpdf/DESC.in \

However, I then took a closer look at history and found this:

2011-08-14  Deri James  <address@hidden>

        [gropdf] More minor fixes.

        * font/devpdf/Makefile.sub (MOSTLYCLEANADD): Don't attempt to
        install 'util/BuildFoundries', only used in 'make'.

So I think that this is a regression in Bertrand's Automake migration,
and a more correct fix would be as follows (whitespace-damaged, but this
is just for discussion - I can commit it myself if people think this is
correct):

diff --git a/font/devpdf/devpdf.am b/font/devpdf/devpdf.am
index 067da3fd..1facd122 100644
--- a/font/devpdf/devpdf.am
+++ b/font/devpdf/devpdf.am
@@ -49,9 +49,6 @@ DEVPDFFONTMAP_1 = \
 DEVPDFFONTMAP_2 = font/devpdf/map/symbolmap
 devpdffontmap_DATA = $(DEVPDFFONTMAP_1) $(DEVPDFFONTMAP_2)

-devpdffontutildir = $(devpdffontdir)/util
-nodist_devpdffontutil_DATA = font/devpdf/util/BuildFoundries
-
 EXTRA_DIST += \
   font/devpdf/DESC.in \
   font/devpdf/Foundry.in \
@@ -136,8 +133,8 @@ mostlyclean_devpdf_extra:
 install-data-local: install_devpdf
 install_devpdf:
        @echo Installing devpdf files
-       address@hidden -d $(DESTDIR)$(devpdffontdir)/util \
-         || $(mkinstalldirs) $(DESTDIR)$(devpdffontdir)/util
+       address@hidden -d $(DESTDIR)$(devpdffontdir) \
+         || $(mkinstalldirs) $(DESTDIR)$(devpdffontdir)
        @for f in $(GROFF_FONT_FILES); do \
          $(RM) $(DESTDIR)$(devpdffontdir)/$$f; \
          if test -f $$f; then \
@@ -155,9 +152,6 @@ uninstall_devpdf:
          for f in $(GROFF_FONT_FILES); do \
            rm -f $(DESTDIR)$(devpdffontdir)/$$f; \
          done; \
-         if test -d $(DESTDIR)$(devpdffontutildir); then \
-           rmdir $(DESTDIR)$(devpdffontutildir); \
-         fi; \
          if test -d $(DESTDIR)$(devpdffontencdir); then \
            rmdir $(DESTDIR)$(devpdffontencdir); \
          fi; \

What do you think?

Thanks,

-- 
Colin Watson                                       address@hidden