X-Git-Url: https://git.distorted.org.uk/~mdw/cfd/blobdiff_plain/74c50df9aca7e5416d8e7d3d2c8f385ff103b081..282625e1b87743236f1cb8c70c2762edd413c6b0:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 29080c2..5f91699 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,24 +8,26 @@
 ###----- Licensing notice ---------------------------------------------------
 ###
 ### This file is part of the Common Files Distribution (`common')
-### 
+###
 ### `Common' is free software; you can redistribute it and/or modify
 ### it under the terms of the GNU General Public License as published by
 ### the Free Software Foundation; either version 2 of the License, or
 ### (at your option) any later version.
-### 
+###
 ### `Common' is distributed in the hope that it will be useful,
 ### but WITHOUT ANY WARRANTY; without even the implied warranty of
 ### MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ### GNU General Public License for more details.
-### 
+###
 ### You should have received a copy of the GNU General Public License
 ### along with `common'; if not, write to the Free Software Foundation,
 ### Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 bin_SCRIPTS		 =
 pkgdata_SCRIPTS		 =
+dist_pkgdata_SCRIPTS	 =
 pkgdata_DATA		 =
+dist_pkgdata_DATA	 =
 
 EXTRA_DIST		 =
 CLEANFILES		 =
@@ -33,9 +35,14 @@ CLEANFILES		 =
 ###--------------------------------------------------------------------------
 ### Handy variables.
 
-confsubst = $(srcdir)/confsubst
+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  $@";
+SUBST = $(V_SUBST)$(confsubst)
+
 ###--------------------------------------------------------------------------
 ### Main scripts.
 
@@ -45,10 +52,10 @@ CLEANFILES		+= mklinks
 EXTRA_DIST		+= mklinks.in
 
 mklinks: mklinks.in Makefile
-	$(confsubst) $(srcdir)/mklinks.in >$@.new \
+	$(SUBST) $(srcdir)/mklinks.in >$@.new \
 		pkgdatadir=$(pkgdatadir) VERSION=$(VERSION)
-	chmod +x $@.new
-	mv $@.new $@
+	$(AM_V_at)chmod +x $@.new
+	$(AM_V_at)mv $@.new $@
 
 ## findlinks
 bin_SCRIPTS		+= findlinks
@@ -56,10 +63,10 @@ CLEANFILES		+= findlinks
 EXTRA_DIST		+= findlinks.in
 
 findlinks: findlinks.in Makefile
-	$(confsubst) $(srcdir)/findlinks.in >$@.new \
+	$(SUBST) $(srcdir)/findlinks.in >$@.new \
 		pkgdatadir=$(pkgdatadir) VERSION=$(VERSION)
-	chmod +x $@.new
-	mv $@.new $@
+	$(AM_V_at)chmod +x $@.new
+	$(AM_V_at)mv $@.new $@
 
 ## mdw-setup
 bin_SCRIPTS		+= mdw-setup
@@ -69,28 +76,68 @@ EXTRA_DIST		+= mdw-setup
 ### Files to install.
 
 ## Licences.
-pkgdata_DATA		+= COPYING COPYING.LIB
-pkgdata_DATA		+= gpl.tex lgpl.tex gpl.texi lgpl.texi
+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-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.
-pkgdata_DATA		+= INSTALL
-pkgdata_DATA		+= texinice.tex
+dist_pkgdata_DATA	+= INSTALL
+dist_pkgdata_DATA	+= texinice.tex
 
 ## Useful code.
-pkgdata_DATA		+= mdwopt.c mdwopt.h
-pkgdata_DATA		+= getdate.y getdate.h
+dist_pkgdata_DATA	+= mdwopt.c mdwopt.h
+dist_pkgdata_DATA	+= getdate.y getdate.h
 
 ## Scripts.
-pkgdata_SCRIPTS		+= install-ac
-pkgdata_SCRIPTS		+= maninst
+dist_pkgdata_SCRIPTS	+= install-ac
+dist_pkgdata_SCRIPTS	+= maninst
+
+## Python support stuff.
+dist_pkgdata_DATA	+= mdwsetup.py
+dist_pkgdata_DATA	+= pysetup.mk
+
+## confsubst
 pkgdata_SCRIPTS		+= confsubst
+CLEANFILES		+= confsubst
+EXTRA_DIST		+= confsubst.in
 
-## Testsuites.
-pkgdata_DATA		+= autotest.am
-pkgdata_DATA		+= testsuite.at
+confsubst: confsubst.in Makefile
+	$(SUBST) $(srcdir)/confsubst.in >$@.new VERSION=$(VERSION)
+	$(AM_V_at)chmod +x $@.new
+	$(AM_V_at)mv $@.new $@
 
-EXTRA_DIST		+= $(pkgdata_DATA)
-EXTRA_DIST		+= $(pkgdata_SCRIPTS)
+## auto-version
+pkgdata_SCRIPTS		+= auto-version
+CLEANFILES		+= auto-version
+EXTRA_DIST		+= auto-version.in
+
+auto-version: auto-version.in Makefile
+	$(SUBST) $(srcdir)/auto-version.in >$@.new VERSION=$(VERSION)
+	$(AM_V_at)chmod +x $@.new
+	$(AM_V_at)mv $@.new $@
+
+## Testsuites.
+dist_pkgdata_DATA	+= autotest.am
+dist_pkgdata_DATA	+= testsuite.at
 
 ## Autoconf snippets.
 EXTRA_DIST		+= aclocal.glob
@@ -107,7 +154,7 @@ uninstall-hook::
 ###--------------------------------------------------------------------------
 ### Documentation.
 
-info_TEXINFOS = common.texi
+info_TEXINFOS		 = common.texi
 
 ###--------------------------------------------------------------------------
 ### Other special tweaks.
@@ -123,9 +170,11 @@ dist-hook::
 ###--------------------------------------------------------------------------
 ### Debian.
 
+EXTRA_DIST		+= debian/compat
 EXTRA_DIST		+= debian/control
 EXTRA_DIST		+= debian/copyright
 EXTRA_DIST		+= debian/rules
 EXTRA_DIST		+= debian/changelog
+EXTRA_DIST		+= debian/source/format
 
 ###----- That's all, folks --------------------------------------------------