[groff] 01/01: chem & gpinyin: improve Makefile.sub

groff-commit
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[groff] 01/01: chem & gpinyin: improve Makefile.sub

From:	Bernd Warken
Subject:	[groff] 01/01: chem & gpinyin: improve Makefile.sub
Date:	Thu, 25 Sep 2014 18:44:51 +0000
bwarken pushed a commit to branch master
in repository groff.

commit 7ef2ff0e02a487c2c779e02f94838e4c99e8c026
Author: Bernd Warken <address@hidden>
Date:   Thu Sep 25 20:43:51 2014 +0200

    chem & gpinyin: improve Makefile.sub
---
 contrib/chem/ChangeLog       |    6 +++
 contrib/chem/Makefile.sub    |   86 ++++++++++++++++++++++++------------------
 contrib/chem/chem.pl         |    2 +-
 contrib/gpinyin/ChangeLog    |    6 +++
 contrib/gpinyin/Makefile.sub |   12 +++---
 contrib/gpinyin/gpinyin.pl   |    2 +-
 6 files changed, 69 insertions(+), 45 deletions(-)

diff --git a/contrib/chem/ChangeLog b/contrib/chem/ChangeLog
index c2c8fda..3ba2a26 100644
--- a/contrib/chem/ChangeLog
+++ b/contrib/chem/ChangeLog
@@ -1,5 +1,11 @@
 2014-09-03  Bernd Warken  <address@hidden>
 
+       * chem.pl: New chem version 1.0.5.
+
+       * Makefile.sub: Add .PHONY.  Restructure install and uninstall.
+
+2014-09-03  Bernd Warken  <address@hidden>
+
        * chem.pl: New chem version 1.0.4.  Change version().
 
        * all `chem' source files: Add and improve the copying
diff --git a/contrib/chem/Makefile.sub b/contrib/chem/Makefile.sub
index a770317..cd1fa17 100644
--- a/contrib/chem/Makefile.sub
+++ b/contrib/chem/Makefile.sub
@@ -40,16 +40,16 @@ README: $(srcdir)/README.txt
 examples: examples/README examples/122/README
 
 examples/README: $(srcdir)/examples/README.txt
-       -test -d examples || $(mkinstalldirs) examples
+       test -d examples || $(mkinstalldirs) examples;
        sed -e "s|@g@|$(g)|g" $? >$@
 
 examples/122/README: $(srcdir)/examples/122/README.txt
-       -test -d examples || $(mkinstalldirs) examples
-       -test -d examples/122 || $(mkinstalldirs) examples/122
-       sed -e "s|@g@|$(g)|g" $? >$@
+       test -d examples || $(mkinstalldirs) examples;
+       test -d examples/122 || $(mkinstalldirs) examples/122;
+       sed -e "s|@g@|$(g)|g" $? >$@;
 
 chem: $(srcdir)/chem.pl $(SH_DEPS_SED_SCRIPT)
-       $(RM) $@
+       $(RM) $@;
        sed -f "$(SH_DEPS_SED_SCRIPT)" \
            -e "s|@g@|$(g)|g" \
            -e "s|@BINDIR@|$(DESTDIR)$(bindir)|g" \
@@ -57,52 +57,64 @@ chem: $(srcdir)/chem.pl $(SH_DEPS_SED_SCRIPT)
            -e "s|@PICDIR@|$(DESTDIR)$(datasubdir)/pic|g" \
            -e "s|@VERSION@|$(version)$(revision)|g" \
            -e "$(SH_SCRIPT_SED_CMD)" \
-           $(srcdir)/chem.pl >$@
-       chmod +x $@
+           $(srcdir)/chem.pl >$@;
+       chmod +x $@;
 
-install_data: install_always $(make_install_examples)
+.PHONY: install_always
 install_always: chem README $(srcdir)/chem.pic
-       -test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir)
-       $(RM) $(DESTDIR)$(bindir)/$(g)chem
-       $(INSTALL_SCRIPT) chem $(DESTDIR)$(bindir)/$(g)chem
-       -test -d $(DESTDIR)$(datasubdir)/pic \
-          || $(mkinstalldirs) $(DESTDIR)$(datasubdir)/pic
-       $(RM) $(DESTDIR)$(datasubdir)/pic/chem.pic
+       test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir);
+       $(RM) $(DESTDIR)$(bindir)/$(g)chem;
+       $(INSTALL_SCRIPT) chem $(DESTDIR)$(bindir)/$(g)chem;
+       test -d $(DESTDIR)$(datasubdir)/pic \
+         || $(mkinstalldirs) $(DESTDIR)$(datasubdir)/pic;
+       $(RM) $(DESTDIR)$(datasubdir)/pic/chem.pic;
        $(INSTALL_DATA) $(srcdir)/chem.pic \
-         $(DESTDIR)$(datasubdir)/pic/chem.pic
-
-install_examples: install_always examples
-       -test -d $(DESTDIR)$(exampledir)/chem \
-          || $(mkinstalldirs) $(DESTDIR)$(exampledir)/chem
-       -test -d $(DESTDIR)$(exampledir)/chem/122 \
-          || $(mkinstalldirs) $(DESTDIR)$(exampledir)/chem/122
-       -find $(DESTDIR)$(exampledir)/chem -type f -exec rm -f '{}' ';'
-       $(INSTALL_DATA) examples/README $(DESTDIR)$(exampledir)/chem/README
+         $(DESTDIR)$(datasubdir)/pic/chem.pic;
+
+.PHONY: install_examples
+install_examples:
+       test -d $(DESTDIR)$(exampledir)/chem \
+         || $(mkinstalldirs) $(DESTDIR)$(exampledir)/chem;
+       test -d $(DESTDIR)$(exampledir)/chem/122 \
+         || $(mkinstalldirs) $(DESTDIR)$(exampledir)/chem/122;
+       find $(DESTDIR)$(exampledir)/chem -type f -exec rm -f '{}' ';'
+       $(INSTALL_DATA) examples/README $(DESTDIR)$(exampledir)/chem/README;
        for i in $(srcdir)/examples/*.chem; do \
          n=`echo $$i | sed 's|$(srcdir)/examples/||g'`; \
          $(INSTALL_DATA) $$i $(DESTDIR)$(exampledir)/chem/$$n; \
-       done
+       done;
        $(INSTALL_DATA) examples/122/README \
-         $(DESTDIR)$(exampledir)/chem/122/README
+         $(DESTDIR)$(exampledir)/chem/122/README;
        for i in $(srcdir)/examples/122/*.chem; do \
          n=`echo $$i | sed 's|$(srcdir)/examples/122/||g'`; \
          $(INSTALL_DATA) $$i $(DESTDIR)$(exampledir)/chem/122/$$n; \
        done
 
-uninstall_sub: uninstall_always $(make_uninstall_examples)
+.PHONY: install_data
+install_data: install_always 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 && \
-         rmdir $(DESTDIR)$(datasubdir)/pic
-
-uninstall_examples: uninstall_always
-       $(RM) $(DESTDIR)$(exampledir)/chem/122/*
-       -test -d $(DESTDIR)$(exampledir)/chem/122 || \
-         rmdir $(DESTDIR)$(exampledir)/chem/122
-       $(RM) $(DESTDIR)$(exampledir)/chem/*
+       $(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 && \
-         rmdir $(DESTDIR)$(exampledir)/chem
+         rmdir $(DESTDIR)$(exampledir)/chem;
+
+.PHONY: uninstall_sub
+uninstall_sub: uninstall_always uninstall_examples
 
 ########################################################################
 # Emacs settings
diff --git a/contrib/chem/chem.pl b/contrib/chem/chem.pl
index 175821e..1a8b3cc 100755
--- a/contrib/chem/chem.pl
+++ b/contrib/chem/chem.pl
@@ -26,7 +26,7 @@ my $Copyright = 'Copyright (C) 2006-2014 Free Software 
Foundation, Inc.';
 # settings
 ########################################################################
 
-my $Program_Version = '1.0.4';
+my $Program_Version = '1.0.5';
 
 # this setting of the groff version is only used before make is run,
 # otherwise @VERSION@ will set it.
diff --git a/contrib/gpinyin/ChangeLog b/contrib/gpinyin/ChangeLog
index 94424f4..777664a 100644
--- a/contrib/gpinyin/ChangeLog
+++ b/contrib/gpinyin/ChangeLog
@@ -1,3 +1,9 @@
+2014-09-25  Bernd Warken  <address@hidden>
+
+       * gpinyin.pl: Version 1.0.2
+
+       * Makefile.sub: Add .PHONY.  Restructure install and uninstall.
+
 2014-09-03  Bernd Warken  <address@hidden>
 
        Version 1.0.1
diff --git a/contrib/gpinyin/Makefile.sub b/contrib/gpinyin/Makefile.sub
index df037ac..d7b310e 100644
--- a/contrib/gpinyin/Makefile.sub
+++ b/contrib/gpinyin/Makefile.sub
@@ -34,7 +34,7 @@ all: gpinyin
 
 gpinyin: gpinyin.pl
        sed -f "$(SH_DEPS_SED_SCRIPT)" \
-            -e "s|@g@|$(g)|g" \
+           -e "s|@g@|$(g)|g" \
            -e "s|@BINDIR@|$(DESTDIR)$(bindir)|g" \
            -e "s|@VERSION@|$(version)$(revision)|g" \
            -e "$(SH_SCRIPT_SED_CMD)" \
@@ -43,21 +43,21 @@ gpinyin: gpinyin.pl
 
 .PHONY: install_data
 install_data: gpinyin subs.pl
-       -test -d $(DESTDIR)$(bindir) || \
+       test -d $(DESTDIR)$(bindir) || \
          $(mkinstalldirs) $(DESTDIR)$(bindir); \
        $(RM) $(DESTDIR)$(bindir)/gpinyin; \
        $(INSTALL_SCRIPT) gpinyin $(DESTDIR)$(bindir)/gpinyin; \
-        -test -d $(DESTDIR)$(gpinyin_dir) || \
+       test -d $(DESTDIR)$(gpinyin_dir) || \
          $(mkinstalldirs) $(DESTDIR)$(gpinyin_dir); \
        $(RM) $(DESTDIR)$(gpinyin_dir)/subs.pl; \
-        $(INSTALL_SCRIPT) $(srcdir)/subs.pl \
+       $(INSTALL_SCRIPT) $(srcdir)/subs.pl \
          $(DESTDIR)$(gpinyin_dir)/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/gpinyin/gpinyin.pl b/contrib/gpinyin/gpinyin.pl
index 668dd41..d4b5375 100755
--- a/contrib/gpinyin/gpinyin.pl
+++ b/contrib/gpinyin/gpinyin.pl
@@ -9,7 +9,7 @@
 
 # Written by Bernd Warken <address@hidden>.
 
-my $version = '1.0.1';
+my $version = '1.0.2';
 
 # This file is part of `gpinyin', which is part of `groff'.
[Prev in Thread]
Current Thread
[Next in Thread]
[groff] 01/01: chem & gpinyin: improve Makefile.sub, Bernd Warken <=
Prev by Date: [groff] 01/01: Refactor psbb line input function; avoid a buffer overrun.
Next by Date: [groff] 01/01: grog: rewrite with new subs structure, and repair many details.
Previous by thread: [groff] 01/01: Refactor psbb line input function; avoid a buffer overrun.
Next by thread: [groff] 01/01: grog: rewrite with new subs structure, and repair many details.
Index(es):
- Date
- Thread