[Freeciv-Dev] (PR#20719) change forms of AC_OUTPUT variables in Makefile.am files

["Jason Dorje Short" <jdorje@xxxxxxxxx>]

<URL: http://bugs.freeciv.org/Ticket/Display.html?id=20719 >

This patch changes the form of autoconf variables in the Makefile.am 
files.  Currently the @ form is used in most places, as in @INTLLIBS@. 
The simpler form is just to use make variables, as in $(INTLLIBS).  The 
latter form works because AC_OUTPUT automatically sets up such variables 
for every subst'd entry.  It is better because the use of the (already 
existing) variables simplifies debugging.

I will commit this one immediately.

-jason

Index: utility/ftwl/Makefile.am
===================================================================
--- utility/ftwl/Makefile.am    (revision 12305)
+++ utility/ftwl/Makefile.am    (working copy)
@@ -8,7 +8,7 @@
 
 noinst_LIBRARIES = $(FTWLLIB)
 
-AM_CPPFLAGS = -I. -I$(top_srcdir)/utility  -I../../intl 
-I/usr/include/freetype2 @CLIENT_CFLAGS@
+AM_CPPFLAGS = -I. -I$(top_srcdir)/utility  -I../../intl 
-I/usr/include/freetype2 $(CLIENT_CFLAGS)
 
 BACKEND_COMMON_FILES=          \
        be_common_32.c          \
Index: server/Makefile.am
===================================================================
--- server/Makefile.am  (revision 12305)
+++ server/Makefile.am  (working copy)
@@ -8,7 +8,7 @@
        -I$(top_srcdir)/utility -I$(srcdir)/../common -I$(srcdir)/../ai \
        -I../intl -I$(top_srcdir)/common/aicore \
        -I$(srcdir)/generator -I$(srcdir)/scripting \
-       @LIBGGZ_INCLUDES@ @GGZDMOD_INCLUDES@
+       $(LIBGGZ_INCLUDES) $(GGZDMOD_INCLUDES)
 
 ## Above, note -I../intl instead of -I$(top_srdir/intl) is deliberate.
 
@@ -93,9 +93,9 @@
       ../dependencies/lua/src/lib/liblualib.a \
       ../dependencies/tolua/libtolua.a \
       ./generator/libgenerator.a
-civserver_LDFLAGS = @GGZDMOD_LDFLAGS@
+civserver_LDFLAGS = $(GGZDMOD_LDFLAGS)
 civserver_LDADD        = ../utility/libcivutility.a ../common/libcivcommon.a \
-      ../ai/libcivai.a ../utility/libcivutility.a ./libcivserver.a @INTLLIBS@ \
+      ../ai/libcivai.a ../utility/libcivutility.a ./libcivserver.a $(INTLLIBS) 
\
       ../utility/libcivutility.a ../common/libcivcommon.a ../ai/libcivai.a \
       ../utility/libcivutility.a ./libcivserver.a ../utility/libcivutility.a \
       ../common/aicore/libaicore.a ./generator/libgenerator.a \
@@ -103,7 +103,7 @@
       ../dependencies/lua/src/liblua.a \
       ../dependencies/lua/src/lib/liblualib.a \
       ../dependencies/tolua/libtolua.a \
-      $(AUTH_LIBS) $(SERVER_LIBS) @LIB_GGZDMOD@
+      $(AUTH_LIBS) $(SERVER_LIBS) $(LIB_GGZDMOD)
 
 
 
Index: data/isophex/Makefile.am
===================================================================
--- data/isophex/Makefile.am    (revision 12305)
+++ data/isophex/Makefile.am    (working copy)
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 ## Override automake so that "make install" puts these in proper place:
-pkgdatadir = $(datadir)/@PACKAGE@/isophex
+pkgdatadir = $(datadir)/$(PACKAGE)/isophex
 
 pkgdata_DATA =          \
        darkness.png    \
Index: data/amplio/Makefile.am
===================================================================
--- data/amplio/Makefile.am     (revision 12305)
+++ data/amplio/Makefile.am     (working copy)
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 ## Override automake so that "make install" puts these in proper place:
-pkgdatadir = $(datadir)/@PACKAGE@/amplio
+pkgdatadir = $(datadir)/$(PACKAGE)/amplio
 
 pkgdata_DATA =                 \
        ancientcities.png       \
Index: data/isotrident/Makefile.am
===================================================================
--- data/isotrident/Makefile.am (revision 12305)
+++ data/isotrident/Makefile.am (working copy)
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 ## Override automake so that "make install" puts these in proper place:
-pkgdatadir = $(datadir)/@PACKAGE@/isotrident
+pkgdatadir = $(datadir)/$(PACKAGE)/isotrident
 
 pkgdata_DATA =          \
        cities.png      \
Index: data/hex2t/Makefile.am
===================================================================
--- data/hex2t/Makefile.am      (revision 12305)
+++ data/hex2t/Makefile.am      (working copy)
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 ## Override automake so that "make install" puts these in proper place:
-pkgdatadir = $(datadir)/@PACKAGE@/hex2t
+pkgdatadir = $(datadir)/$(PACKAGE)/hex2t
 
 pkgdata_DATA =          \
        grid.png        \
Index: data/civ1/Makefile.am
===================================================================
--- data/civ1/Makefile.am       (revision 12305)
+++ data/civ1/Makefile.am       (working copy)
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 ## Override automake so that "make install" puts these in proper place:
-pkgdatadir = $(datadir)/@PACKAGE@/civ1
+pkgdatadir = $(datadir)/$(PACKAGE)/civ1
 
 pkgdata_DATA =          \
        buildings.ruleset \
Index: data/scenario/Makefile.am
===================================================================
--- data/scenario/Makefile.am   (revision 12305)
+++ data/scenario/Makefile.am   (working copy)
@@ -20,7 +20,7 @@
 
 
 ## Override automake so that "make install" puts these in proper place:
-pkgdatadir = $(datadir)/@PACKAGE@/scenario
+pkgdatadir = $(datadir)/$(PACKAGE)/scenario
 pkgdata_DATA = $(zipped_files)
 
 $(zipped_files): %.sav.gz: %.sav
Index: data/civ2/Makefile.am
===================================================================
--- data/civ2/Makefile.am       (revision 12305)
+++ data/civ2/Makefile.am       (working copy)
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 ## Override automake so that "make install" puts these in proper place:
-pkgdatadir = $(datadir)/@PACKAGE@/civ2
+pkgdatadir = $(datadir)/$(PACKAGE)/civ2
 
 pkgdata_DATA =          \
        buildings.ruleset \
Index: data/buildings/Makefile.am
===================================================================
--- data/buildings/Makefile.am  (revision 12305)
+++ data/buildings/Makefile.am  (working copy)
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 ## Override automake so that "make install" puts these in proper place:
-pkgdatadir = $(datadir)/@PACKAGE@/buildings
+pkgdatadir = $(datadir)/$(PACKAGE)/buildings
 
 pkgdata_DATA =                 \
        airport.png             \
Index: data/default/Makefile.am
===================================================================
--- data/default/Makefile.am    (revision 12305)
+++ data/default/Makefile.am    (working copy)
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 ## Override automake so that "make install" puts these in proper place:
-pkgdatadir = $(datadir)/@PACKAGE@/default
+pkgdatadir = $(datadir)/$(PACKAGE)/default
 
 pkgdata_DATA =          \
        buildings.ruleset \
Index: data/stdsounds/Makefile.am
===================================================================
--- data/stdsounds/Makefile.am  (revision 12305)
+++ data/stdsounds/Makefile.am  (working copy)
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 ## Override automake so that "make install" puts these in proper place:
-pkgdatadir = $(datadir)/@PACKAGE@/stdsounds
+pkgdatadir = $(datadir)/$(PACKAGE)/stdsounds
 
 pkgdata_DATA =          \
        foot3.ogg       \
Index: data/nation/Makefile.am
===================================================================
--- data/nation/Makefile.am     (revision 12305)
+++ data/nation/Makefile.am     (working copy)
@@ -2,7 +2,7 @@
 # Note: After adding a new nation file, 'make Makefile.am'
 
 ## Override automake so that "make install" puts these in proper place:
-pkgdatadir = $(datadir)/@PACKAGE@/nation
+pkgdatadir = $(datadir)/$(PACKAGE)/nation
 
 pkgdata_DATA = \
                aborigines.ruleset \
Index: data/misc/Makefile.am
===================================================================
--- data/misc/Makefile.am       (revision 12305)
+++ data/misc/Makefile.am       (working copy)
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 ## Override automake so that "make install" puts these in proper place:
-pkgdatadir = $(datadir)/@PACKAGE@/misc
+pkgdatadir = $(datadir)/$(PACKAGE)/misc
 
 pkgdata_DATA =          \
        buildings.png   \
Index: data/flags/Makefile.am
===================================================================
--- data/flags/Makefile.am      (revision 12305)
+++ data/flags/Makefile.am      (working copy)
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 ## Override automake so that "make install" puts these in proper place:
-pkgdatadir = $(datadir)/@PACKAGE@/flags
+pkgdatadir = $(datadir)/$(PACKAGE)/flags
 
 flag_files =                           \
                aborigines.png          \
Index: data/trident/Makefile.am
===================================================================
--- data/trident/Makefile.am    (revision 12305)
+++ data/trident/Makefile.am    (working copy)
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 ## Override automake so that "make install" puts these in proper place:
-pkgdatadir = $(datadir)/@PACKAGE@/trident
+pkgdatadir = $(datadir)/$(PACKAGE)/trident
 
 pkgdata_DATA =          \
        auto_ll.spec    \
Index: manual/Makefile.am
===================================================================
--- manual/Makefile.am  (revision 12305)
+++ manual/Makefile.am  (working copy)
@@ -19,10 +19,10 @@
       ../dependencies/lua/src/lib/liblualib.a \
       ../dependencies/tolua/libtolua.a \
       ../server/generator/libgenerator.a
-civmanual_LDFLAGS = @GGZDMOD_LDFLAGS@
+civmanual_LDFLAGS = $(GGZDMOD_LDFLAGS)
 civmanual_LDADD        = ../utility/libcivutility.a ../common/libcivcommon.a \
       ../ai/libcivai.a ../utility/libcivutility.a ../server/libcivserver.a \
-      @INTLLIBS@ ../client/helpdata.o \
+      $(INTLLIBS) ../client/helpdata.o \
       ../utility/libcivutility.a ../common/libcivcommon.a ../ai/libcivai.a \
       ../utility/libcivutility.a ../server/libcivserver.a \
       ../utility/libcivutility.a ../common/aicore/libaicore.a \
@@ -31,4 +31,4 @@
       ../dependencies/lua/src/lib/liblualib.a \
       ../dependencies/tolua/libtolua.a \
       ../server/generator/libgenerator.a \
-      $(SERVER_LIBS) $(AUTH_LIBS) @LIB_GGZDMOD@
+      $(SERVER_LIBS) $(AUTH_LIBS) $(LIB_GGZDMOD)
Index: client/agents/Makefile.am
===================================================================
--- client/agents/Makefile.am   (revision 12305)
+++ client/agents/Makefile.am   (working copy)
@@ -2,7 +2,7 @@
 
 noinst_LIBRARIES = libagents.a
 
-AM_CPPFLAGS = -I. -I$(srcdir)/.. -I$(top_srcdir)/common/aicore 
-I$(srcdir)/../include -I$(top_srcdir)/utility -I$(top_srcdir)/common 
-I../../intl -I$(srcdir)/../gui-gtk @CLIENT_CFLAGS@
+AM_CPPFLAGS = -I. -I$(srcdir)/.. -I$(top_srcdir)/common/aicore 
-I$(srcdir)/../include -I$(top_srcdir)/utility -I$(top_srcdir)/common 
-I../../intl -I$(srcdir)/../gui-gtk $(CLIENT_CFLAGS)
 
 libagents_a_SOURCES =          \
        agents.c                \
Index: client/gui-gtk-2.0/Makefile.am
===================================================================
--- client/gui-gtk-2.0/Makefile.am      (revision 12305)
+++ client/gui-gtk-2.0/Makefile.am      (working copy)
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 noinst_LIBRARIES = libguiclient.a
-AM_CPPFLAGS = -I. -I$(srcdir)/.. -I$(srcdir)/../include 
-I$(top_srcdir)/utility -I$(top_srcdir)/common -I$(top_srcdir)/common/aicore 
-I../../intl -I$(srcdir)/../agents @CLIENT_CFLAGS@ @GGZ_GTK_INCLUDES@
+AM_CPPFLAGS = -I. -I$(srcdir)/.. -I$(srcdir)/../include 
-I$(top_srcdir)/utility -I$(top_srcdir)/common -I$(top_srcdir)/common/aicore 
-I../../intl -I$(srcdir)/../agents $(CLIENT_CFLAGS) $(GGZ_GTK_INCLUDES)
 
 ## Above, note -I../../intl instead of -I$(top_srdir/intl) is deliberate.
 # The AM_CPPFLAGS "-I." is so resources.c includes the locally generated 
Index: client/gui-xaw/Makefile.am
===================================================================
--- client/gui-xaw/Makefile.am  (revision 12305)
+++ client/gui-xaw/Makefile.am  (working copy)
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 noinst_LIBRARIES = libguiclient.a
-AM_CPPFLAGS = -I. -I$(srcdir)/.. -I$(srcdir)/../include 
-I$(top_srcdir)/utility -I$(top_srcdir)/common -I../../intl 
-I$(top_srcdir)/common/aicore -I../../intl -I$(srcdir)/../agents @CLIENT_CFLAGS@
+AM_CPPFLAGS = -I. -I$(srcdir)/.. -I$(srcdir)/../include 
-I$(top_srcdir)/utility -I$(top_srcdir)/common -I../../intl 
-I$(top_srcdir)/common/aicore -I../../intl -I$(srcdir)/../agents 
$(CLIENT_CFLAGS)
 
 ## Above, note -I../../intl instead of -I$(top_srdir/intl) is deliberate.
 # The AM_CPPFLAGS "-I." is so resources.c includes the locally generated 
Index: client/gui-win32/Makefile.am
===================================================================
--- client/gui-win32/Makefile.am        (revision 12305)
+++ client/gui-win32/Makefile.am        (working copy)
@@ -2,7 +2,7 @@
 
 noinst_LIBRARIES = libguiclient.a
 
-AM_CPPFLAGS = -I. -I$(srcdir)/.. -I$(srcdir)/../agents -I$(top_srcdir)/utility 
-I$(srcdir)/../include -I$(top_srcdir)/common/aicore -I$(top_srcdir)/common 
-I../../intl @CLIENT_CFLAGS@
+AM_CPPFLAGS = -I. -I$(srcdir)/.. -I$(srcdir)/../agents -I$(top_srcdir)/utility 
-I$(srcdir)/../include -I$(top_srcdir)/common/aicore -I$(top_srcdir)/common 
-I../../intl $(CLIENT_CFLAGS)
 
 ## Above, note -I../../intl instead of -I$(top_srdir)/intl is deliberate.
 
Index: client/gui-sdl/Makefile.am
===================================================================
--- client/gui-sdl/Makefile.am  (revision 12305)
+++ client/gui-sdl/Makefile.am  (working copy)
@@ -2,7 +2,7 @@
 
 noinst_LIBRARIES = libguiclient.a
 
-AM_CPPFLAGS = -I$(srcdir)/.. -I$(srcdir)/../include -I$(top_srcdir)/utility 
-I$(top_srcdir)/common -I$(top_srcdir)/common/aicore -I../../intl 
-I$(srcdir)/../agents @CLIENT_CFLAGS@
+AM_CPPFLAGS = -I$(srcdir)/.. -I$(srcdir)/../include -I$(top_srcdir)/utility 
-I$(top_srcdir)/common -I$(top_srcdir)/common/aicore -I../../intl 
-I$(srcdir)/../agents $(CLIENT_CFLAGS)
 
 ## Above, note -I../../intl instead of -I$(top_srdir/intl) is deliberate.
 
Index: client/gui-ftwl/Makefile.am
===================================================================
--- client/gui-ftwl/Makefile.am (revision 12305)
+++ client/gui-ftwl/Makefile.am (working copy)
@@ -3,7 +3,7 @@
 SUBDIRS = 
 
 noinst_LIBRARIES = libguiclient.a
-AM_CPPFLAGS = -I. -I$(top_srcdir)/utility -I$(top_srcdir)/utility/ftwl 
-I$(top_srcdir)/common -I$(top_srcdir)/common/aicore -I$(srcdir)/.. 
-I$(srcdir)/../include -I../../intl @CLIENT_CFLAGS@
+AM_CPPFLAGS = -I. -I$(top_srcdir)/utility -I$(top_srcdir)/utility/ftwl 
-I$(top_srcdir)/common -I$(top_srcdir)/common/aicore -I$(srcdir)/.. 
-I$(srcdir)/../include -I../../intl $(CLIENT_CFLAGS)
 
 ## Above, note -I../../intl instead of -I$(top_srdir)/intl is deliberate.
 
Index: client/gui-stub/Makefile.am
===================================================================
--- client/gui-stub/Makefile.am (revision 12305)
+++ client/gui-stub/Makefile.am (working copy)
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 noinst_LIBRARIES = libguiclient.a
-AM_CPPFLAGS = -I. -I$(srcdir)/.. -I$(srcdir)/../include 
-I$(top_srcdir)/utility -I$(top_srcdir)/common -I../../intl @CLIENT_CFLAGS@
+AM_CPPFLAGS = -I. -I$(srcdir)/.. -I$(srcdir)/../include 
-I$(top_srcdir)/utility -I$(top_srcdir)/common -I../../intl $(CLIENT_CFLAGS)
 
 ## Above, note -I../../intl instead of -I$(top_srdir)/intl is deliberate.
 
Index: client/Makefile.am
===================================================================
--- client/Makefile.am  (revision 12305)
+++ client/Makefile.am  (working copy)
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 ## Below used to be just 
-##    SUBDIRS = @gui_sources@
+##    SUBDIRS = $(gui_sources)
 ## but that doesn't work properly for "make dist"
 
 if CLIENT_GUI_SDL
@@ -118,7 +118,7 @@
 
 bin_PROGRAMS = civclient
 
-AM_CPPFLAGS = -I$(top_srcdir)/utility -I$(srcdir)/include 
-I$(top_srcdir)/common -I$(top_srcdir)/common/aicore -I../intl 
-I$(srcdir)/agents @SOUND_CFLAGS@ @LIBGGZ_INCLUDES@ @GGZMOD_INCLUDES@ 
@GGZ_GTK_INCLUDES@
+AM_CPPFLAGS = -I$(top_srcdir)/utility -I$(srcdir)/include 
-I$(top_srcdir)/common -I$(top_srcdir)/common/aicore -I../intl 
-I$(srcdir)/agents $(SOUND_CFLAGS) $(LIBGGZ_INCLUDES) $(GGZMOD_INCLUDES) 
$(GGZ_GTK_INCLUDES)
 
 ## Above, note -I../intl instead of -I$(top_srdir/intl) is deliberate.
 
@@ -186,16 +186,16 @@
        audio_none.c    \
        audio_none.h
 
-civclient_LDFLAGS = @CLIENT_LDFLAGS@ @GGZMOD_LDFLAGS@
+civclient_LDFLAGS = $(CLIENT_LDFLAGS) $(GGZMOD_LDFLAGS)
 fc_civclient_libs =    ../utility/libcivutility.a      \
                        $(LIBFTWL)                      \
                        ../common/libcivcommon.a        \
                        ../common/aicore/libaicore.a    \
                        agents/libagents.a              \
-                       @gui_sources@/libguiclient.a
+                       $(gui_sources)/libguiclient.a
 civclient_DEPENDENCIES = $(fc_civclient_libs)
 civclient_LDADD        = $(fc_civclient_libs) $(fc_civclient_libs) \
-       @INTLLIBS@ @CLIENT_LIBS@ @SOUND_LIBS@ @LIB_GGZMOD@
+       $(INTLLIBS) $(CLIENT_LIBS) $(SOUND_LIBS) $(LIB_GGZMOD)
 desktopfiledir = $(prefix)/share/applications
 desktopfile_DATA = \
        freeciv.desktop