Correct an optional DLL installation and packaging defect.

diff --git a/mingwrt/ChangeLog b/mingwrt/ChangeLog
index a5f663e..de131d6 100644 (file)
--- a/mingwrt/ChangeLog
+++ b/mingwrt/ChangeLog
@@ -1,5 +1,14 @@
 2018-12-22  Keith Marshall  <keith@users.osdn.me>
 
+       Correct an optional DLL installation and packaging defect.
+
+       * Makefile.in (optional_dll): New function macro; define it, and...
+       (MAP_LIBMINGWEX_A_DLLVERSION): ...wrap this, replacing all usage of...
+       (optional_dll_version, optional_dll_package): ...these; delete them,
+       together with all dependent references.
+
+2018-12-22  Keith Marshall  <keith@users.osdn.me>
+
        Update ANSI stdio feature test to accommodate ISO-C11.
 
        * include/_mingw.h.in (__USE_MINGW_ANSI_STDIO): Add a deprecation

diff --git a/mingwrt/Makefile.in b/mingwrt/Makefile.in
index cfc2b64..723c4b4 100644 (file)
--- a/mingwrt/Makefile.in
+++ b/mingwrt/Makefile.in
@@ -656,11 +656,17 @@ libgmon.a: $(addsuffix .$(OBJEXT), gmon mcount profil)
 #
 DLLVERSION = "0:0:0"
 
+# DLLVERSION must be specified for each DLL file itself, and also for
+# the associated installation and distribution rules; the appropriate
+# dependencies may be specified by use of this function macro:
+#
+optional_dll = mingwrt-$1-optdist install-$1-optional-dll $2
+
 # Generally, we should prefer to have explicit version specifications,
 # relating individually to each DLL; these are specified in VERSION.m4,
 # and propagated here via configure time substitution.
 #
-@MAP_LIBMINGWEX_A_DLLVERSION@
+$(call optional_dll,libmingwex,@MAP_LIBMINGWEX_A_DLLVERSION@)
 
 # For convenience, we implement the DLL build rule in the form of a
 # generic pattern rule, invoked in the form of a request to build any
@@ -813,9 +819,6 @@ install-%-dll-files:
        $(call INSTALL_DATA,$^,${bindir})
        $(if $(STRIP_DLL),$(call STRIP_DLL,$^))
 
-$(call optional_dll_version,libmingwex,@MAP_LIBMINGWEX_A_DLLVERSION@)
-optional_dll_version = $(shell echo '$2' | sed s,^[^:]*,install-$1-optional-dll,)
-
 install-optional-dlls: install-mingwrt-optional-dlls
 install-mingwrt-optional-dlls: install-libmingwex-optional-dll
 install-%-optional-dll: %.dll.a bindir libdir
@@ -931,9 +934,6 @@ mingwrt-mandist: %-mandist:
 optdist: mingwrt-optdist
 mingwrt-optdist: mingwrt-libmingwex-optdist
 
-$(call optional_dll_package,libmingwex,@MAP_LIBMINGWEX_A_DLLVERSION@)
-optional_dll_package = $(shell echo '$2' | sed s,^[^:]*,mingwrt-$1-optdist)
-
 mingwrt-%-optdist:
        $(RM) -r tmp
        $(MAKE) --no-print-directory prefix=`pwd`/tmp install-strip-$*-optional-dll