[gnuastro-commits] master c177923 3/3: BuildProgram's configuration file not in tarball

[Mohammad Akhlaghi]

branch: master
commit c177923a4faca65d7f35a11924c9b2e82ef027dc
Author: Mohammad Akhlaghi <address@hidden>
Commit: Mohammad Akhlaghi <address@hidden>

    BuildProgram's configuration file not in tarball
    
    For some reason, we hadn't corrected the `dist_' prefix from BuildProgram's
    configuration file in its `Makefile.am'. Therefore the configuration file
    was being distributed in the tarball and the user's requested `CPPFLAGS'
    and `LDFLAGS' were not actually being written into it (it is already built
    from the packager's values for these options!!!).
    
    With this commit the `dist_' prefix has been changed to `nodist_' to fix
    the problem. But we also need the configuration file during a check. So it
    is now also given to `check_DATA'.
---
 NEWS                      |  1 +
 bin/buildprog/Makefile.am | 14 +++++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index 93dfe39..d7b9892 100644
--- a/NEWS
+++ b/NEWS
@@ -39,6 +39,7 @@ GNU Astronomy Utilities NEWS                          -*- 
outline -*-
   bug #54188: MakeCatalog's Upperlimit not being sigma-clipped properly.
   bug #54284: Crop segrault when catalog contains no data.
   bug #54285: make check fails if g++ not present.
+  bug #54286: BuildProgram's configuration file, not built by default.
 
 
 
diff --git a/bin/buildprog/Makefile.am b/bin/buildprog/Makefile.am
index 7555f03..446186e 100644
--- a/bin/buildprog/Makefile.am
+++ b/bin/buildprog/Makefile.am
@@ -37,8 +37,10 @@ bin_PROGRAMS = astbuildprog
 ## Reason for linking with `libgnu' described in `bin/TEMPLATE/Makefile.am'.
 astbuildprog_LDADD = $(top_builddir)/bootstrapped/lib/libgnu.la -lgnuastro
 
-astbuildprog_SOURCES = main.c ui.c buildprog.c astbuildprog.conf
+# Basic program sources.
+astbuildprog_SOURCES = main.c ui.c buildprog.c
 
+# Extra files that must be distributed in the tarball.
 EXTRA_DIST = main.h authors-cite.h args.h ui.h buildprog.h astbuildprog.conf.in
 
 
@@ -73,7 +75,13 @@ astbuildprog.conf: 
$(top_srcdir)/bin/buildprog/astbuildprog.conf.in
 
 
 
-## The configuration file (clean, distribute and install).
+## The configuration file in BuildProgram must be built on the users's
+## system (see above). The built configuration file is needed during `make
+## check'. But the (built) configuration file should NOT be distributed in a
+## tarball. Since all built files are distributed, the only way to avoid
+## the configuration file being distributed it so use a `nodist_' prefix.
+##
 ## NOTE: the man page is created in doc/Makefile.am
+nodist_sysconf_DATA = astbuildprog.conf
+check_DATA = astbuildprog.conf
 CLEANFILES = astbuildprog.conf
-dist_sysconf_DATA = astbuildprog.conf