Use consistent uppercase for configure exported variables.

Author: eldering

Makefile

@@ -66,7 +66,7 @@ domserver-create-dirs:
 	-$(INSTALL_USER)    -m 0700 -d $(DESTDIR)$(domserver_logdir)
 	-$(INSTALL_USER)    -m 0700 -d $(DESTDIR)$(domserver_rundir)
 	-$(INSTALL_WEBSITE) -m 0770 -d $(DESTDIR)$(domserver_submitdir)
-ifneq "$(fhs_enabled)" "yes"
+ifneq "$(FHS_ENABLED)" "yes"
 	-$(INSTALL_WEBSITE) -m 0770 -d $(DESTDIR)$(domserver_tmpdir)
 endif
 
@@ -76,7 +76,7 @@ judgehost-create-dirs:
 	-$(INSTALL_USER) -m 0700 -d $(DESTDIR)$(judgehost_logdir)
 	-$(INSTALL_USER) -m 0700 -d $(DESTDIR)$(judgehost_rundir)
 	-$(INSTALL_USER) -m 0711 -d $(DESTDIR)$(judgehost_judgedir)
-ifneq "$(fhs_enabled)" "yes"
+ifneq "$(FHS_ENABLED)" "yes"
 	-$(INSTALL_USER) -m 0700 -d $(DESTDIR)$(judgehost_tmpdir)
 endif
 

configure.ac

@@ -11,14 +11,14 @@ AC_DEFUN([AX_WITH_COMMENT], [
 	AC_ARG_WITH([ax_comment_$1],[$2],[],[])
 	])
 
-AC_SUBST(fhs_enabled,[])
+AC_SUBST(FHS_ENABLED,no)
 AC_ARG_ENABLE(fhs,AS_HELP_STRING([--enable-fhs],
 [use FHS directories (default: no), see below under "Optional
  Packages" for path configuration when FHS is disabled.]),
-[if test "x$enableval" != xno ; then AC_SUBST(fhs_enabled,yes) fi])
+[if test "x$enableval" != xno ; then AC_SUBST(FHS_ENABLED,yes) fi])
 
 if test "x$prefix" = xNONE; then
-	if test "x$fhs_enabled" = xyes ; then
+	if test "x$FHS_ENABLED" = xyes ; then
 		prefix=$ac_default_prefix
 	else
 		prefix="/opt/domjudge"
@@ -142,7 +142,7 @@ fi
 # {{{ FHS directory structure
 
 # These are defaults that can still be overridden below!
-if test "x$fhs_enabled" = xyes ; then
+if test "x$FHS_ENABLED" = xyes ; then
 	AC_SUBST(domserver_root,        '')
 	AC_SUBST(domserver_bindir,      $bindir)
 	AC_SUBST(domserver_etcdir,      $sysconfdir/${PACKAGE_TARNAME})
@@ -178,7 +178,7 @@ fi
 AC_DEFUN([AX_PATH], [
 	AC_ARG_WITH($1,[  --with-$1=DIR   	(default: $2)],
 		[AC_SUBST($1, $withval)],
-		[if test "x$fhs_enabled" != xyes ; then AC_SUBST($1, $2) fi])
+		[if test "x$FHS_ENABLED" != xyes ; then AC_SUBST($1, $2) fi])
 	])
 
 AX_WITH_COMMENT(2,[  ])

paths.mk.in

@@ -70,7 +70,8 @@ DOMJUDGE_USER   = @DOMJUDGE_USER@
 WEBSERVER_GROUP = @WEBSERVER_GROUP@
 
 # Autoconf prefixes and paths
-fhs_enabled    = @fhs_enabled@
+FHS_ENABLED    = @FHS_ENABLED@
+
 prefix         = @prefix@
 exec_prefix    = @exec_prefix@