build: Reorder variables in Makefile.in.

Move down derived variables so that the top of Makefile.in consists
only of definitions of Make variables from autoconf variables.

diff --git a/Makefile.in b/Makefile.in
index a976dc973e988bbbdc977206ada0a3787c98dbfc..f453ed054939cfeeab02be5a34aeb9f292a7fa50 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,23 +1,21 @@
 prefix := @prefix@
 exec_prefix := @exec_prefix@
 
 prefix := @prefix@
 exec_prefix := @exec_prefix@
 

+# These two use prefix and exec_prefix

 BINDIR := @bindir@
 BINDIR := @bindir@

-VARDIR := /var/paraslash
-MANDIR := @datarootdir@/man/man1
+datarootdir := @datarootdir@
+

 PACKAGE_TARNAME := @PACKAGE_TARNAME@
 PACKAGE_VERSION := @PACKAGE_VERSION@
 PACKAGE_TARNAME := @PACKAGE_TARNAME@
 PACKAGE_VERSION := @PACKAGE_VERSION@

-INSTALL := @install@
-STRIP := $(CROSS_COMPILE)strip
-HOSTCC ?= cc
-executables := @executables@
-ggo_descriptions_declared := @ggo_descriptions_declared@
-object_executable_matrix := @object_executable_matrix@
-

 
 

+INSTALL := @install@

 GENGETOPT := @gengetopt@
 HELP2MAN := @help2man@
 GENGETOPT := @gengetopt@
 HELP2MAN := @help2man@

-MKDIR_P := mkdir -p

 
 

+ggo_descriptions_declared := @ggo_descriptions_declared@
+object_executable_matrix := @object_executable_matrix@
+
+executables := @executables@

 recv_objs := @recv_objs@
 filter_objs := @filter_objs@
 client_objs := @client_objs@
 recv_objs := @recv_objs@
 filter_objs := @filter_objs@
 client_objs := @client_objs@


@@ -64,13 +62,17 @@ nsl_ldflags := @nsl_ldflags@
 curses_ldflags := @curses_ldflags@
 core_audio_ldflags := @core_audio_ldflags@
 
 curses_ldflags := @curses_ldflags@
 core_audio_ldflags := @core_audio_ldflags@
 

+VARDIR := /var/paraslash
+MANDIR := $(datarootdir)/man/man1
+STRIP := $(CROSS_COMPILE)strip
+HOSTCC ?= cc
+MKDIR_P := mkdir -p

 prefixed_executables := $(addprefix para_, $(executables))
 
 build_date := $(shell date)
 uname_s := $(shell uname -s 2>/dev/null || echo "UNKNOWN_OS")
 uname_rs := $(shell uname -rs)
 cc_version := $(shell $(CC) --version | head -n 1)
 prefixed_executables := $(addprefix para_, $(executables))
 
 build_date := $(shell date)
 uname_s := $(shell uname -s 2>/dev/null || echo "UNKNOWN_OS")
 uname_rs := $(shell uname -rs)
 cc_version := $(shell $(CC) --version | head -n 1)

-

 GIT_VERSION := $(shell ./GIT-VERSION-GEN git-version.h)
 
 m4_ggo_dir := m4/gengetopt
 GIT_VERSION := $(shell ./GIT-VERSION-GEN git-version.h)
 
 m4_ggo_dir := m4/gengetopt