build: Unify spelling of commands and directories.

Always spell commands in upper case and directories in lower case.

This is a first step to auto-generate Makefile.in.

diff --git a/Makefile.in b/Makefile.in
index 14015c9bf5915e8a3f2355e1947d50ea6aced07e..bad4d87239b4d6e34ea75e2a4f760d92c9e96299 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -2,15 +2,15 @@ prefix := @prefix@
 exec_prefix := @exec_prefix@
 
 # These two use prefix and exec_prefix
-BINDIR := @bindir@
+bindir := @bindir@
 datarootdir := @datarootdir@
 
 PACKAGE_TARNAME := @PACKAGE_TARNAME@
 PACKAGE_VERSION := @PACKAGE_VERSION@
 
-INSTALL := @install@
-GENGETOPT := @gengetopt@
-HELP2MAN := @help2man@
+INSTALL := @INSTALL@
+GENGETOPT := @GENGETOPT@
+HELP2MAN := @HELP2MAN@
 
 ggo_descriptions_declared := @ggo_descriptions_declared@
 object_executable_matrix := @object_executable_matrix@

diff --git a/Makefile.real b/Makefile.real
index 1ceb3e96ad71802a64a18e65e729b2309e8694c8..faa6d2af3b0de7a20d46b8da2e8bece7598d8e91 100644 (file)
--- a/Makefile.real
+++ b/Makefile.real
@@ -1,5 +1,5 @@
-VARDIR := /var/paraslash
-MANDIR := $(datarootdir)/man/man1
+vardir := /var/paraslash
+mandir := $(datarootdir)/man/man1
 STRIP := $(CROSS_COMPILE)strip
 HOSTCC ?= cc
 MKDIR_P := mkdir -p
@@ -81,10 +81,10 @@ $(subst p,P,$(subst q,Q,$(subst r,R,$(subst s,S,$(subst t,T,\
 $(subst u,U,$(subst v,V,$(subst w,W,$(subst x,X,$(subst y,Y,\
 $(subst z,Z,$1))))))))))))))))))))))))))
 
-CPPFLAGS += -DBINDIR='"$(BINDIR)"'
-CPPFLAGS += -DBUILD_DATE='"$(build_date)"'
-CPPFLAGS += -DUNAME_RS='"$(uname_rs)"'
-CPPFLAGS += -DCC_VERSION='"$(cc_version)"'
+CPPFLAGS += -DBINDIR='"$(bindir)"'
+CPPFLAGS += -DBUILD_DATE='"$(shell date)"'
+CPPFLAGS += -DUNAME_RS='"$(shell uname -rs)"'
+CPPFLAGS += -DCC_VERSION='"$(shell $(CC) --version | head -n 1)"'
 CPPFLAGS += -DMAIN_INPUT_FILE_IS_$(*F)
 CPPFLAGS += $(arch_cppflags)
 CPPFLAGS += -I/usr/local/include
@@ -344,11 +344,11 @@ maintainer-clean: distclean
        $(Q) rm -rf web_sync
 
 install: all man
-       $(MKDIR_P) $(BINDIR) $(MANDIR)
+       $(MKDIR_P) $(bindir) $(mandir)
        $(INSTALL) -s --strip-program $(STRIP) -m 755 \
-               $(prefixed_executables) $(BINDIR)
-       $(INSTALL) -m 644 $(man_pages) $(MANDIR)
-       $(MKDIR_P) $(VARDIR) >/dev/null 2>&1 || true # not fatal, so don't complain
+               $(prefixed_executables) $(bindir)
+       $(INSTALL) -m 644 $(man_pages) $(mandir)
+       $(MKDIR_P) $(vardir) >/dev/null 2>&1 || true # not fatal, so don't complain
 
 $(tarball):
        $(Q) rm -rf $(tarball) $(tarball_pfx)

diff --git a/configure.ac b/configure.ac
index 8095d33a548d3d9ae01d712c3dc3482a81ba8990..2edabc86d6e1deb28a3df7edbb668d0a12c73c8b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -81,16 +81,16 @@ fi
 
 AC_C_BIGENDIAN()
 
-AC_PATH_PROG([gengetopt], [gengetopt])
-test -z "$gengetopt" && AC_MSG_ERROR(
+AC_PATH_PROG([GENGETOPT], [gengetopt])
+test -z "$GENGETOPT" && AC_MSG_ERROR(
        [gengetopt is required to build this package])
 
-AC_PATH_PROG([help2man], [help2man])
-test -z "$help2man" && AC_MSG_ERROR(
+AC_PATH_PROG([HELP2MAN], [help2man])
+test -z "$HELP2MAN" && AC_MSG_ERROR(
        [help2man is required to build this package])
 
-AC_PATH_PROG([install], [install])
-test -z "$install" && AC_MSG_ERROR(
+AC_PATH_PROG([INSTALL], [install])
+test -z "$INSTALL" && AC_MSG_ERROR(
        [The install program is required to build this package])
 
 AC_PROG_CC
@@ -194,7 +194,7 @@ if test ${have_ucred} = yes; then
        AC_DEFINE(HAVE_UCRED, 1, define to 1 you have struct ucred)
 fi
 ########################################################################### gengetopt
-echo 'option "z" z "" flag off' | $gengetopt --file-name conftest-ggo &&
+echo 'option "z" z "" flag off' | $GENGETOPT --file-name conftest-ggo &&
 AC_CHECK_DECL(
        [gengetopt_args_info_description],
        [ggo_descriptions_declared=yes],