Makefile.am: Ship `debian/compat'.

[cfd] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 862491d..39cb00b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,7 +25,9 @@
 
 bin_SCRIPTS             =
 pkgdata_SCRIPTS                 =
+dist_pkgdata_SCRIPTS    =
 pkgdata_DATA            =
+dist_pkgdata_DATA       =
 
 EXTRA_DIST              =
 CLEANFILES              =
@@ -36,6 +38,11 @@ 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  $@";
+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,23 +76,23 @@ 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      += COPYING COPYING.LIB
+dist_pkgdata_DATA      += gpl.tex lgpl.tex gpl.texi 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.
-pkgdata_SCRIPTS                += mdwsetup.py
+dist_pkgdata_SCRIPTS   += mdwsetup.py
 
 ## confsubst
 pkgdata_SCRIPTS                += confsubst
@@ -93,10 +100,9 @@ CLEANFILES          += confsubst
 EXTRA_DIST             += confsubst.in
 
 confsubst: confsubst.in Makefile
-       $(confsubst) $(srcdir)/confsubst.in >$@.new \
-               VERSION=$(VERSION)
-       chmod +x $@.new
-       mv $@.new $@
+       $(SUBST) $(srcdir)/confsubst.in >$@.new VERSION=$(VERSION)
+       $(AM_V_at)chmod +x $@.new
+       $(AM_V_at)mv $@.new $@
 
 ## auto-version
 pkgdata_SCRIPTS                += auto-version
@@ -104,17 +110,13 @@ CLEANFILES                += auto-version
 EXTRA_DIST             += auto-version.in
 
 auto-version: auto-version.in Makefile
-       $(confsubst) $(srcdir)/auto-version.in >$@.new \
-               VERSION=$(VERSION)
-       chmod +x $@.new
-       mv $@.new $@
+       $(SUBST) $(srcdir)/auto-version.in >$@.new VERSION=$(VERSION)
+       $(AM_V_at)chmod +x $@.new
+       $(AM_V_at)mv $@.new $@
 
 ## Testsuites.
-pkgdata_DATA           += autotest.am
-pkgdata_DATA           += testsuite.at
-
-EXTRA_DIST             += $(pkgdata_DATA)
-EXTRA_DIST             += $(pkgdata_SCRIPTS)
+dist_pkgdata_DATA      += autotest.am
+dist_pkgdata_DATA      += testsuite.at
 
 ## Autoconf snippets.
 EXTRA_DIST             += aclocal.glob
@@ -147,6 +149,7 @@ dist-hook::
 ###--------------------------------------------------------------------------
 ### Debian.
 
+EXTRA_DIST             += debian/compat
 EXTRA_DIST             += debian/control
 EXTRA_DIST             += debian/copyright
 EXTRA_DIST             += debian/rules