[groff] 01/01: Fix `install' and `uninstall' issues.

[Bertrand Garrigues]

bgarrigues pushed a commit to branch master
in repository groff.

commit fe33a2736386146c79da3b9dec507d2dfc2a6927
Author: Bertrand Garrigues <address@hidden>
Date:   Thu Oct 23 23:39:35 2014 +0200

    Fix `install' and `uninstall' issues.
    
    * contrib/chem/Makefile.sub (install_data): Fix build with option
    --with-doc=no passed to configure (target `install_examples'
    should not be executed).
    
    * contrib/chem/Makefile.sub (uninstall_sub):  `uninstall' failed
    if directories to be removed were not present.
    
    * contrib/gpinyin/Makefile.sub (uninstall_sub): Ditto.
    
    * contrib/hdtbl/Makefile.sub (GENFILES): generated files should
    depend on the creation of the `examples' directory.
---
 ChangeLog                    |   16 ++++++++++++++++
 contrib/chem/Makefile.sub    |   19 +++++++++----------
 contrib/gpinyin/Makefile.sub |    4 ++--
 contrib/hdtbl/Makefile.sub   |    2 ++
 4 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5633a95..f93ed31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2014-10-23  Bertrand Garrigues  <address@hidden>
+
+       Fix `install' and `uninstall' issues.
+
+       * contrib/chem/Makefile.sub (install_data): Fix build with option
+       --with-doc=no passed to configure (target `install_examples'
+       should not be executed).
+
+       * contrib/chem/Makefile.sub (uninstall_sub):  `uninstall' failed
+       if directories to be removed were not present.
+
+       * contrib/gpinyin/Makefile.sub (uninstall_sub): Ditto.
+
+       * contrib/hdtbl/Makefile.sub (GENFILES): generated files should
+       depend on the creation of the `examples' directory.
+
 2014-10-23  Daiki Ueno  <address@hidden>
 
        * m4/iconv.m4: Really avoid false detection of non-working iconv.
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)