Re: [Groff] release ready

[Bertrand Garrigues]

Hi all,

On Sat, Oct 11 2014 at 09:13:16 AM, Werner LEMBERG <address@hidden> wrote:
> I want to wait a few days so that you can test and check whether
> everything's fine.  Please do so!

I've found a few issues on the install target if you pass the option
--with-doc=no to configure.

- In chem I got this error:

make[2]: Entering directory
'/data/programming/groff/savannah/test/build/contrib/chem'
[...]
/usr/bin/install -c -m 644 examples/README \
/home/bertrand/tmp/master//usr/local/share/doc/groff-1.22.3/examples/chem/README;
 
/usr/bin/install: cannot stat ‘examples/README’: No such file or directory

Bernd,

If I'm not mistaken you changed:

install_data: install_always $(make_install_examples)

for:

install_data: install_always install_examples

which causes the the `install_examples' rule to be executed, causing the
error.  Why did you have to make this change?  It seems to me that the
previous dependency was correct.

- In hdtbl I got this error:

make[2]: Entering directory
'/data/programming/groff/savannah/test/build-no/contrib/hdtbl' 

sed -e "s|@fontdir@|/usr/local/share/groff/1.22.3/font|" \
/home/bertrand/programming/groff/savannah/test/build-no/../contrib/hdtbl/examples/fonts_n.in
 > examples/fonts_n.roff

/bin/sh: examples/fonts_n.roff: No such file or directory

Adding the following dependency fixes the problem:

$(GENFILES): examples/stamp

- Another (minor) problem: make uninstall fails if executed twice in a
  row (or if passing an empty directory to DESTDIR).  Adding a few "-"
  before `test' fix the problem.

Here is a patch containing the modifications I had to make to correct
the 3 problems mentioned above.

Regards,

diff --git a/contrib/chem/Makefile.sub b/contrib/chem/Makefile.sub
index cd1fa17..b13dc2e 100644
--- a/contrib/chem/Makefile.sub
+++ b/contrib/chem/Makefile.sub
@@ -91,26 +91,25 @@ install_examples:
        done
 
 .PHONY: install_data
-install_data: install_always install_examples
 
-#install_data: install_always $(make_install_examples)
+install_data: install_always $(make_install_examples)
 
 # uninstall_sub: uninstall_always $(make_uninstall_examples)
 
 .PHONY: uninstall_always
 uninstall_always:
-       $(RM) $(DESTDIR)$(bindir)/chem; \
-       $(RM) $(DESTDIR)$(datasubdir)/pic/chem.pic; \
-       test -d $(DESTDIR)$(datasubdir)/pic && \
+       $(RM) $(DESTDIR)$(bindir)/chem;
+       $(RM) $(DESTDIR)$(datasubdir)/pic/chem.pic;
+       -test -d $(DESTDIR)$(datasubdir)/pic && \
          rmdir $(DESTDIR)$(datasubdir)/pic;
 
 .PHONY: uninstall_examples
 uninstall_examples:
-       $(RM) $(DESTDIR)$(exampledir)/chem/122/*; \
-       test -d $(DESTDIR)$(exampledir)/chem/122 && \
-         rmdir $(DESTDIR)$(exampledir)/chem/122; \
-       $(RM) $(DESTDIR)$(exampledir)/chem/*; \
-       test -d $(DESTDIR)$(exampledir)/chem && \
+       $(RM) $(DESTDIR)$(exampledir)/chem/122/*;
+       -test -d $(DESTDIR)$(exampledir)/chem/122 && \
+         rmdir $(DESTDIR)$(exampledir)/chem/122;
+       $(RM) $(DESTDIR)$(exampledir)/chem/*;
+       -test -d $(DESTDIR)$(exampledir)/chem && \
          rmdir $(DESTDIR)$(exampledir)/chem;
 
 .PHONY: uninstall_sub
diff --git a/contrib/gpinyin/Makefile.sub b/contrib/gpinyin/Makefile.sub
index 5aa8859..4c499de 100644
--- a/contrib/gpinyin/Makefile.sub
+++ b/contrib/gpinyin/Makefile.sub
@@ -57,8 +57,8 @@ install_data: gpinyin subs.pl
 .PHONY: uninstall_sub
 uninstall_sub:
        $(RM) $(DESTDIR)$(bindir)/gpinyin; \
-       $(RM) $(DESTDIR)$(gpinyin_dir)/subs.pl; \
-       test -d $(DESTDIR)$(gpinyin_dir) && \
+       $(RM) $(DESTDIR)$(gpinyin_dir)/subs.pl;
+       -test -d $(DESTDIR)$(gpinyin_dir) && \
          rmdir $(DESTDIR)$(gpinyin_dir)
 
 
diff --git a/contrib/hdtbl/Makefile.sub b/contrib/hdtbl/Makefile.sub
index 5bc06d8..149311d 100644
--- a/contrib/hdtbl/Makefile.sub
+++ b/contrib/hdtbl/Makefile.sub
@@ -126,6 +126,8 @@ stamp-strip: $(STRIPFILES)
        done
        touch $@
 
+$(GENFILES): examples/stamp
+
 install_data: install_always $(make_install_examples)
 
 install_always: $(STRIPFILES) $(GENFILES)

--
Bertrand Garrigues