Skip to content

Commit 6304f74

Browse files
vmcjvmcj
committed
Re-align for future commit
Small alignment fixes for the next commit where a new option will be added.
1 parent 15fae53 commit 6304f74

File tree

2 files changed

+73
-73
lines changed

2 files changed

+73
-73
lines changed

‎configure.ac

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -161,34 +161,34 @@ fi
161161
# These are defaults that can still be overridden below!
162162
if test "x$FHS_ENABLED" = xyes ; then
163163
if test "x$DOMSERVER_BUILD_ENABLED" = xyes; then
164-
AC_SUBST(domserver_root, '')
165-
AC_SUBST(domserver_bindir, $bindir)
166-
AC_SUBST(domserver_etcdir, $sysconfdir/${PACKAGE_TARNAME})
167-
AC_SUBST(domserver_webappdir, $datadir/${PACKAGE_TARNAME}/webapp)
168-
AC_SUBST(domserver_sqldir, $datadir/${PACKAGE_TARNAME}/sql)
169-
AC_SUBST(domserver_libdir, $libdir/${PACKAGE_TARNAME})
170-
AC_SUBST(domserver_libvendordir, $libdir/${PACKAGE_TARNAME}/vendor)
171-
AC_SUBST(domserver_logdir, $localstatedir/log/${PACKAGE_TARNAME})
172-
AC_SUBST(domserver_rundir, $localstatedir/run/${PACKAGE_TARNAME})
173-
AC_SUBST(domserver_tmpdir, /tmp)
174-
AC_SUBST(domserver_exampleprobdir,$datadir/${PACKAGE_TARNAME}/example_problems)
164+
AC_SUBST(domserver_root, '')
165+
AC_SUBST(domserver_bindir, $bindir)
166+
AC_SUBST(domserver_etcdir, $sysconfdir/${PACKAGE_TARNAME})
167+
AC_SUBST(domserver_webappdir, $datadir/${PACKAGE_TARNAME}/webapp)
168+
AC_SUBST(domserver_sqldir, $datadir/${PACKAGE_TARNAME}/sql)
169+
AC_SUBST(domserver_libdir, $libdir/${PACKAGE_TARNAME})
170+
AC_SUBST(domserver_libvendordir, $libdir/${PACKAGE_TARNAME}/vendor)
171+
AC_SUBST(domserver_logdir, $localstatedir/log/${PACKAGE_TARNAME})
172+
AC_SUBST(domserver_rundir, $localstatedir/run/${PACKAGE_TARNAME})
173+
AC_SUBST(domserver_tmpdir, /tmp)
174+
AC_SUBST(domserver_exampleprobdir, $datadir/${PACKAGE_TARNAME}/example_problems)
175175
fi
176176

177177
if test "x$JUDGEHOST_BUILD_ENABLED" = xyes; then
178-
AC_SUBST(judgehost_root, '')
179-
AC_SUBST(judgehost_bindir, $bindir)
180-
AC_SUBST(judgehost_etcdir, $sysconfdir/${PACKAGE_TARNAME})
181-
AC_SUBST(judgehost_libdir, $libdir/${PACKAGE_TARNAME})
182-
AC_SUBST(judgehost_libjudgedir, $libdir/${PACKAGE_TARNAME}/judge)
183-
AC_SUBST(judgehost_logdir, $localstatedir/log/${PACKAGE_TARNAME})
184-
AC_SUBST(judgehost_rundir, $localstatedir/run/${PACKAGE_TARNAME})
185-
AC_SUBST(judgehost_tmpdir, /tmp)
186-
AC_SUBST(judgehost_judgedir, $localstatedir/lib/${PACKAGE_TARNAME}/judgings)
187-
AC_SUBST(judgehost_chrootdir, /chroot/${PACKAGE_TARNAME})
188-
AC_SUBST(judgehost_cgroupdir, /sys/fs/cgroup)
178+
AC_SUBST(judgehost_root, '')
179+
AC_SUBST(judgehost_bindir, $bindir)
180+
AC_SUBST(judgehost_etcdir, $sysconfdir/${PACKAGE_TARNAME})
181+
AC_SUBST(judgehost_libdir, $libdir/${PACKAGE_TARNAME})
182+
AC_SUBST(judgehost_libjudgedir, $libdir/${PACKAGE_TARNAME}/judge)
183+
AC_SUBST(judgehost_logdir, $localstatedir/log/${PACKAGE_TARNAME})
184+
AC_SUBST(judgehost_rundir, $localstatedir/run/${PACKAGE_TARNAME})
185+
AC_SUBST(judgehost_tmpdir, /tmp)
186+
AC_SUBST(judgehost_judgedir, $localstatedir/lib/${PACKAGE_TARNAME}/judgings)
187+
AC_SUBST(judgehost_chrootdir, /chroot/${PACKAGE_TARNAME})
188+
AC_SUBST(judgehost_cgroupdir, /sys/fs/cgroup)
189189
fi
190190

191-
AC_SUBST(domjudge_docdir, $docdir)
191+
AC_SUBST(domjudge_docdir, $docdir)
192192
fi
193193

194194
# }}}
@@ -205,38 +205,38 @@ AC_DEFUN([AX_PATH], [
205205
AX_WITH_COMMENT(2,[ ])
206206
AX_WITH_COMMENT(3,[Fine tuning of installation root paths when FHS is disabled (the default):])
207207
if test "x$DOMSERVER_BUILD_ENABLED" = xyes; then
208-
AX_PATH(domserver_root, [$prefix/domserver])
208+
AX_PATH(domserver_root, [$prefix/domserver])
209209
fi
210210
if test "x$JUDGEHOST_BUILD_ENABLED" = xyes; then
211-
AX_PATH(judgehost_root, [$prefix/judgehost])
211+
AX_PATH(judgehost_root, [$prefix/judgehost])
212212
fi
213-
AX_PATH(domjudge_docdir, [$prefix/doc])
213+
AX_PATH(domjudge_docdir, [$prefix/doc])
214214
AX_WITH_COMMENT(4,[ ])
215215
AX_WITH_COMMENT(5,[More fine tuning of all installation (sub)directories:])
216216
if test "x$DOMSERVER_BUILD_ENABLED" = xyes; then
217-
AX_PATH(domserver_bindir, [$domserver_root/bin])
218-
AX_PATH(domserver_etcdir, [$domserver_root/etc])
219-
AX_PATH(domserver_webappdir, [$domserver_root/webapp])
220-
AX_PATH(domserver_sqldir, [$domserver_root/sql])
221-
AX_PATH(domserver_libdir, [$domserver_root/lib])
222-
AX_PATH(domserver_libvendordir, [$domserver_root/lib/vendor])
223-
AX_PATH(domserver_logdir, [$domserver_root/log])
224-
AX_PATH(domserver_rundir, [$domserver_root/run])
225-
AX_PATH(domserver_tmpdir, [$domserver_root/tmp])
226-
AX_PATH(domserver_exampleprobdir, [$domserver_root/example_problems])
217+
AX_PATH(domserver_bindir, [$domserver_root/bin])
218+
AX_PATH(domserver_etcdir, [$domserver_root/etc])
219+
AX_PATH(domserver_webappdir, [$domserver_root/webapp])
220+
AX_PATH(domserver_sqldir, [$domserver_root/sql])
221+
AX_PATH(domserver_libdir, [$domserver_root/lib])
222+
AX_PATH(domserver_libvendordir, [$domserver_root/lib/vendor])
223+
AX_PATH(domserver_logdir, [$domserver_root/log])
224+
AX_PATH(domserver_rundir, [$domserver_root/run])
225+
AX_PATH(domserver_tmpdir, [$domserver_root/tmp])
226+
AX_PATH(domserver_exampleprobdir, [$domserver_root/example_problems])
227227
fi
228228
if test "x$JUDGEHOST_BUILD_ENABLED" = xyes; then
229229
AX_WITH_COMMENT(6,[ ])
230-
AX_PATH(judgehost_bindir, [$judgehost_root/bin])
231-
AX_PATH(judgehost_etcdir, [$judgehost_root/etc])
232-
AX_PATH(judgehost_libdir, [$judgehost_root/lib])
233-
AX_PATH(judgehost_libjudgedir, [$judgehost_root/lib/judge])
234-
AX_PATH(judgehost_logdir, [$judgehost_root/log])
235-
AX_PATH(judgehost_rundir, [$judgehost_root/run])
236-
AX_PATH(judgehost_tmpdir, [$judgehost_root/tmp])
237-
AX_PATH(judgehost_judgedir, [$judgehost_root/judgings])
238-
AX_PATH(judgehost_chrootdir, [/chroot/${PACKAGE_TARNAME}])
239-
AX_PATH(judgehost_cgroupdir, [/sys/fs/cgroup])
230+
AX_PATH(judgehost_bindir, [$judgehost_root/bin])
231+
AX_PATH(judgehost_etcdir, [$judgehost_root/etc])
232+
AX_PATH(judgehost_libdir, [$judgehost_root/lib])
233+
AX_PATH(judgehost_libjudgedir, [$judgehost_root/lib/judge])
234+
AX_PATH(judgehost_logdir, [$judgehost_root/log])
235+
AX_PATH(judgehost_rundir, [$judgehost_root/run])
236+
AX_PATH(judgehost_tmpdir, [$judgehost_root/tmp])
237+
AX_PATH(judgehost_judgedir, [$judgehost_root/judgings])
238+
AX_PATH(judgehost_chrootdir, [/chroot/${PACKAGE_TARNAME}])
239+
AX_PATH(judgehost_cgroupdir, [/sys/fs/cgroup])
240240
fi
241241
AX_WITH_COMMENT(7,[ ])
242242

‎paths.mk.in

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -81,40 +81,40 @@ pdfdir = @pdfdir@
8181
psdir = @psdir@
8282

8383
# Installation paths
84-
domserver_bindir = @domserver_bindir@
85-
domserver_etcdir = @domserver_etcdir@
86-
domserver_webappdir = @domserver_webappdir@
87-
domserver_sqldir = @domserver_sqldir@
88-
domserver_libdir = @domserver_libdir@
89-
domserver_libvendordir = @domserver_libvendordir@
90-
domserver_logdir = @domserver_logdir@
91-
domserver_rundir = @domserver_rundir@
92-
domserver_tmpdir = @domserver_tmpdir@
93-
domserver_exampleprobdir = @domserver_exampleprobdir@
94-
PHPVERSION = @PHPVERSION@
95-
96-
judgehost_bindir = @judgehost_bindir@
97-
judgehost_etcdir = @judgehost_etcdir@
98-
judgehost_libdir = @judgehost_libdir@
99-
judgehost_libjudgedir = @judgehost_libjudgedir@
100-
judgehost_logdir = @judgehost_logdir@
101-
judgehost_rundir = @judgehost_rundir@
102-
judgehost_tmpdir = @judgehost_tmpdir@
103-
judgehost_judgedir = @judgehost_judgedir@
104-
judgehost_chrootdir = @judgehost_chrootdir@
105-
judgehost_cgroupdir = @judgehost_cgroupdir@
106-
107-
domjudge_docdir = @domjudge_docdir@
108-
109-
systemd_unitdir = @systemd_unitdir@
84+
domserver_bindir = @domserver_bindir@
85+
domserver_etcdir = @domserver_etcdir@
86+
domserver_webappdir = @domserver_webappdir@
87+
domserver_sqldir = @domserver_sqldir@
88+
domserver_libdir = @domserver_libdir@
89+
domserver_libvendordir = @domserver_libvendordir@
90+
domserver_logdir = @domserver_logdir@
91+
domserver_rundir = @domserver_rundir@
92+
domserver_tmpdir = @domserver_tmpdir@
93+
domserver_exampleprobdir = @domserver_exampleprobdir@
94+
PHPVERSION = @PHPVERSION@
95+
96+
judgehost_bindir = @judgehost_bindir@
97+
judgehost_etcdir = @judgehost_etcdir@
98+
judgehost_libdir = @judgehost_libdir@
99+
judgehost_libjudgedir = @judgehost_libjudgedir@
100+
judgehost_logdir = @judgehost_logdir@
101+
judgehost_rundir = @judgehost_rundir@
102+
judgehost_tmpdir = @judgehost_tmpdir@
103+
judgehost_judgedir = @judgehost_judgedir@
104+
judgehost_chrootdir = @judgehost_chrootdir@
105+
judgehost_cgroupdir = @judgehost_cgroupdir@
106+
107+
domjudge_docdir = @domjudge_docdir@
108+
109+
systemd_unitdir = @systemd_unitdir@
110110

111111
# The tmpdir's are not in these lists, since they would otherwise get
112112
# their permissions overwritten in FHS install mode.
113113
domserver_dirs = $(domserver_bindir) $(domserver_etcdir) \
114114
$(domserver_libdir) $(domserver_libvendordir) \
115115
$(domserver_logdir) $(domserver_rundir) \
116116
$(addprefix $(domserver_webappdir)/public/images/,affiliations countries teams) \
117-
$(domserver_exampleprobdir)
117+
$(domserver_exampleprobdir)
118118

119119
judgehost_dirs = $(judgehost_bindir) $(judgehost_etcdir) $(judgehost_libdir) \
120120
$(judgehost_libjudgedir) $(judgehost_logdir) \

0 commit comments

Comments
 (0)