X-Git-Url: https://git.distorted.org.uk/~mdw/cfd/blobdiff_plain/1759269dbdd93d6ab1d074035bc32c420ae50825..6f9cf5797c442bf17bb814743a57a695759842cc:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 0e830d7..7df6892 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,9 +38,9 @@ CLEANFILES		 =
 confsubst = $(srcdir)/confsubst.in
 mkdir_p = $(srcdir)/config/install-sh -d
 
-V_SUBST = $(V_SUBST_$(V))
-V_SUBST_ = $(V_SUBST_$(AM_DEFAULT_VERBOSITY))
-V_SUBST_0 = @echo "  SUBST  $@";
+V_SUBST = $(V_SUBST_@AM_V@)
+V_SUBST_ = $(V_SUBST_@AM_DEFAULT_V@)
+V_SUBST_0 = @echo "  SUBST    $@";
 SUBST = $(V_SUBST)$(confsubst)
 
 ###--------------------------------------------------------------------------
@@ -79,14 +79,25 @@ EXTRA_DIST		+= mdw-setup
 dist_pkgdata_DATA	+= GPL-1 GPL-2 GPL-3
 dist_pkgdata_DATA	+= LGPL-2 LGPL-2.1 LGPL-3
 dist_pkgdata_DATA	+= AGPL-3
-dist_pkgdata_DATA	+= gpl.tex lgpl.tex gpl.texi lgpl.texi
+dist_pkgdata_DATA	+= gpl-2.0.tex gpl-2.0.texi
+dist_pkgdata_DATA	+= lgpl-2.0.tex lgpl-2.0.texi
+dist_pkgdata_DATA	+= lgpl-2.1.tex lgpl-2.1.texi
+dist_pkgdata_DATA	+= gpl-3.0.tex gpl-3.0.texi
+dist_pkgdata_DATA	+= lgpl-3.0.tex lgpl-3.0.texi
+dist_pkgdata_DATA	+= agpl-3.0.tex agpl-3.0.texi
 
 install-data-hook::
 	cd $(DESTDIR)$(pkgdatadir) && $(LN_S) -f GPL-2 COPYING
 	cd $(DESTDIR)$(pkgdatadir) && $(LN_S) -f LGPL-2 COPYING.LIB
+	cd $(DESTDIR)$(pkgdatadir) && $(LN_S) -f gpl-2.0.tex gpl.tex
+	cd $(DESTDIR)$(pkgdatadir) && $(LN_S) -f lgpl-2.0.tex lgpl.tex
+	cd $(DESTDIR)$(pkgdatadir) && $(LN_S) -f gpl-2.0.texi gpl.texi
+	cd $(DESTDIR)$(pkgdatadir) && $(LN_S) -f lgpl-2.0.texi lgpl.texi
 
 uninstall-hook::
 	cd $(DESTDIR)$(pkgdatadir) && rm -f COPYING COPYING.LIB
+	cd $(DESTDIR)$(pkgdatadir) && \
+		rm -f gpl.tex gpl.texi lgpl.tex lgpl.texi
 
 ## Documentation.
 dist_pkgdata_DATA	+= INSTALL
@@ -143,7 +154,7 @@ uninstall-hook::
 ###--------------------------------------------------------------------------
 ### Documentation.
 
-info_TEXINFOS = common.texi
+info_TEXINFOS		 = common.texi
 
 ###--------------------------------------------------------------------------
 ### Other special tweaks.