patch 8.1.0162: Danish and German man pages are not installed

Problem:    Danish and German man pages are not installed. (Tony Mechelynck)
Solution:   Adjust the makefile

diff --git a/src/Makefile b/src/Makefile
index 84595465d6ab141dbf54f3761e7a122d6a4536af..f2fafa4dcad95d6d980a9b1d6e5a6786325f10ca 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -1511,6 +1511,12 @@ DEST_MAN_TOP = $(DESTDIR)$(MANDIR)
 # directory first.
 # FreeBSD uses ".../man/xx.ISO8859-1/man1" for latin1, use that one too.
 DEST_MAN = $(DEST_MAN_TOP)$(MAN1DIR)
+DEST_MAN_DA = $(DEST_MAN_TOP)/da$(MAN1DIR)
+DEST_MAN_DA_I = $(DEST_MAN_TOP)/da.ISO8859-1$(MAN1DIR)
+DEST_MAN_DA_U = $(DEST_MAN_TOP)/da.UTF-8$(MAN1DIR)
+DEST_MAN_DE = $(DEST_MAN_TOP)/de$(MAN1DIR)
+DEST_MAN_DE_I = $(DEST_MAN_TOP)/de.ISO8859-1$(MAN1DIR)
+DEST_MAN_DE_U = $(DEST_MAN_TOP)/de.UTF-8$(MAN1DIR)
 DEST_MAN_FR = $(DEST_MAN_TOP)/fr$(MAN1DIR)
 DEST_MAN_FR_I = $(DEST_MAN_TOP)/fr.ISO8859-1$(MAN1DIR)
 DEST_MAN_FR_U = $(DEST_MAN_TOP)/fr.UTF-8$(MAN1DIR)
@@ -2381,6 +2387,12 @@ installtools: $(TOOLS) $(DESTDIR)$(exec_prefix) $(DEST_BIN) \
 
 # install the language specific files for tools, if they were unpacked
 install-tool-languages:
+       -$(SHELL) ./installman.sh xxd $(DEST_MAN_DA) "-da" $(INSTALLMANARGS)
+       -$(SHELL) ./installman.sh xxd $(DEST_MAN_DA_I) "-da" $(INSTALLMANARGS)
+       -$(SHELL) ./installman.sh xxd $(DEST_MAN_DA_U) "-da.UTF-8" $(INSTALLMANARGS)
+       -$(SHELL) ./installman.sh xxd $(DEST_MAN_DE) "-de" $(INSTALLMANARGS)
+       -$(SHELL) ./installman.sh xxd $(DEST_MAN_DE_I) "-de" $(INSTALLMANARGS)
+       -$(SHELL) ./installman.sh xxd $(DEST_MAN_DE_U) "-de.UTF-8" $(INSTALLMANARGS)
        -$(SHELL) ./installman.sh xxd $(DEST_MAN_FR) "-fr" $(INSTALLMANARGS)
        -$(SHELL) ./installman.sh xxd $(DEST_MAN_FR_I) "-fr" $(INSTALLMANARGS)
        -$(SHELL) ./installman.sh xxd $(DEST_MAN_FR_U) "-fr.UTF-8" $(INSTALLMANARGS)
@@ -2396,6 +2408,12 @@ install-tool-languages:
 
 # install the language specific files, if they were unpacked
 install-languages: languages $(DEST_LANG) $(DEST_KMAP)
+       -$(SHELL) ./installman.sh install $(DEST_MAN_DA) "-da" $(INSTALLMANARGS)
+       -$(SHELL) ./installman.sh install $(DEST_MAN_DA_I) "-da" $(INSTALLMANARGS)
+       -$(SHELL) ./installman.sh install $(DEST_MAN_DA_U) "-da.UTF-8" $(INSTALLMANARGS)
+       -$(SHELL) ./installman.sh install $(DEST_MAN_DE) "-de" $(INSTALLMANARGS)
+       -$(SHELL) ./installman.sh install $(DEST_MAN_DE_I) "-de" $(INSTALLMANARGS)
+       -$(SHELL) ./installman.sh install $(DEST_MAN_DE_U) "-de.UTF-8" $(INSTALLMANARGS)
        -$(SHELL) ./installman.sh install $(DEST_MAN_FR) "-fr" $(INSTALLMANARGS)
        -$(SHELL) ./installman.sh install $(DEST_MAN_FR_I) "-fr" $(INSTALLMANARGS)
        -$(SHELL) ./installman.sh install $(DEST_MAN_FR_U) "-fr.UTF-8" $(INSTALLMANARGS)
@@ -2408,6 +2426,18 @@ install-languages: languages $(DEST_LANG) $(DEST_KMAP)
        -$(SHELL) ./installman.sh install $(DEST_MAN_PL_U) "-pl.UTF-8" $(INSTALLMANARGS)
        -$(SHELL) ./installman.sh install $(DEST_MAN_RU) "-ru" $(INSTALLMANARGS)
        -$(SHELL) ./installman.sh install $(DEST_MAN_RU_U) "-ru.UTF-8" $(INSTALLMANARGS)
+       -$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
+               $(DEST_MAN_DA) $(INSTALLMLARGS)
+       -$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
+               $(DEST_MAN_DA_I) $(INSTALLMLARGS)
+       -$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
+               $(DEST_MAN_DA_U) $(INSTALLMLARGS)
+       -$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
+               $(DEST_MAN_DE) $(INSTALLMLARGS)
+       -$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
+               $(DEST_MAN_DE_I) $(INSTALLMLARGS)
+       -$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
+               $(DEST_MAN_DE_U) $(INSTALLMLARGS)
        -$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
                $(DEST_MAN_FR) $(INSTALLMLARGS)
        -$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
@@ -2582,6 +2612,12 @@ uninstall: uninstall_runtime
 # Note: the "rmdir" will fail if any files were added after "make install"
 uninstall_runtime:
        -$(SHELL) ./installman.sh uninstall $(DEST_MAN) "" $(INSTALLMANARGS)
+       -$(SHELL) ./installman.sh uninstall $(DEST_MAN_DA) "" $(INSTALLMANARGS)
+       -$(SHELL) ./installman.sh uninstall $(DEST_MAN_DA_I) "" $(INSTALLMANARGS)
+       -$(SHELL) ./installman.sh uninstall $(DEST_MAN_DA_U) "" $(INSTALLMANARGS)
+       -$(SHELL) ./installman.sh uninstall $(DEST_MAN_DE) "" $(INSTALLMANARGS)
+       -$(SHELL) ./installman.sh uninstall $(DEST_MAN_DE_I) "" $(INSTALLMANARGS)
+       -$(SHELL) ./installman.sh uninstall $(DEST_MAN_DE_U) "" $(INSTALLMANARGS)
        -$(SHELL) ./installman.sh uninstall $(DEST_MAN_FR) "" $(INSTALLMANARGS)
        -$(SHELL) ./installman.sh uninstall $(DEST_MAN_FR_I) "" $(INSTALLMANARGS)
        -$(SHELL) ./installman.sh uninstall $(DEST_MAN_FR_U) "" $(INSTALLMANARGS)
@@ -2596,6 +2632,18 @@ uninstall_runtime:
        -$(SHELL) ./installman.sh uninstall $(DEST_MAN_RU_U) "" $(INSTALLMANARGS)
        -$(SHELL) ./installml.sh uninstall "$(GUI_MAN_TARGETS)" \
                $(DEST_MAN) $(INSTALLMLARGS)
+       -$(SHELL) ./installml.sh uninstall "$(GUI_MAN_TARGETS)" \
+               $(DEST_MAN_DA) $(INSTALLMLARGS)
+       -$(SHELL) ./installml.sh uninstall "$(GUI_MAN_TARGETS)" \
+               $(DEST_MAN_DA_I) $(INSTALLMLARGS)
+       -$(SHELL) ./installml.sh uninstall "$(GUI_MAN_TARGETS)" \
+               $(DEST_MAN_DA_U) $(INSTALLMLARGS)
+       -$(SHELL) ./installml.sh uninstall "$(GUI_MAN_TARGETS)" \
+               $(DEST_MAN_DE) $(INSTALLMLARGS)
+       -$(SHELL) ./installml.sh uninstall "$(GUI_MAN_TARGETS)" \
+               $(DEST_MAN_DE_I) $(INSTALLMLARGS)
+       -$(SHELL) ./installml.sh uninstall "$(GUI_MAN_TARGETS)" \
+               $(DEST_MAN_DE_U) $(INSTALLMLARGS)
        -$(SHELL) ./installml.sh uninstall "$(GUI_MAN_TARGETS)" \
                $(DEST_MAN_FR) $(INSTALLMLARGS)
        -$(SHELL) ./installml.sh uninstall "$(GUI_MAN_TARGETS)" \
@@ -2621,6 +2669,8 @@ uninstall_runtime:
        -$(SHELL) ./installml.sh uninstall "$(GUI_MAN_TARGETS)" \
                $(DEST_MAN_RU_U) $(INSTALLMLARGS)
        -rm -f $(DEST_MAN)/xxd.1
+       -rm -f $(DEST_MAN_DA)/xxd.1 $(DEST_MAN_DA_I)/xxd.1 $(DEST_MAN_DA_U)/xxd.1
+       -rm -f $(DEST_MAN_DE)/xxd.1 $(DEST_MAN_DE_I)/xxd.1 $(DEST_MAN_DE_U)/xxd.1
        -rm -f $(DEST_MAN_FR)/xxd.1 $(DEST_MAN_FR_I)/xxd.1 $(DEST_MAN_FR_U)/xxd.1
        -rm -f $(DEST_MAN_IT)/xxd.1 $(DEST_MAN_IT_I)/xxd.1 $(DEST_MAN_IT_U)/xxd.1
        -rm -f $(DEST_MAN_JA_U)/xxd.1

diff --git a/src/version.c b/src/version.c
index affeeb2245c139d72906e6ec81e3b544f242401a..c9c252ae0b33bd38228d0658fc63c80d4494d33f 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -789,6 +789,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    162,
 /**/
     161,
 /**/