Skip to content

Commit 2dcb4fd

Browse files
Michael Vasseurvmcj
authored andcommitted
Don't manage libvendor in configure.ac
This this the whole reason for this PR, we can't think of a real usecase where we want to configure the vendor different from the webapp.
1 parent 87d951e commit 2dcb4fd

File tree

3 files changed

+10
-17
lines changed

3 files changed

+10
-17
lines changed

configure.ac

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,6 @@ if test "x$FHS_ENABLED" = xyes ; then
170170
AC_SUBST(domserver_webappdir, $datadir/${PACKAGE_TARNAME}/webapp)
171171
AC_SUBST(domserver_sqldir, $datadir/${PACKAGE_TARNAME}/sql)
172172
AC_SUBST(domserver_libdir, $libdir/${PACKAGE_TARNAME})
173-
AC_SUBST(domserver_libvendordir, $libdir/${PACKAGE_TARNAME}/vendor)
174173
AC_SUBST(domserver_logdir, $localstatedir/log/${PACKAGE_TARNAME})
175174
AC_SUBST(domserver_rundir, $localstatedir/run/${PACKAGE_TARNAME})
176175
AC_SUBST(domserver_tmpdir, /tmp)
@@ -222,7 +221,6 @@ AX_PATH(domserver_etcdir, [$domserver_root/etc])
222221
AX_PATH(domserver_webappdir, [$domserver_root/webapp])
223222
AX_PATH(domserver_sqldir, [$domserver_root/sql])
224223
AX_PATH(domserver_libdir, [$domserver_root/lib])
225-
AX_PATH(domserver_libvendordir, [$domserver_root/lib/vendor])
226224
AX_PATH(domserver_logdir, [$domserver_root/log])
227225
AX_PATH(domserver_rundir, [$domserver_root/run])
228226
AX_PATH(domserver_tmpdir, [$domserver_root/tmp])
@@ -382,7 +380,6 @@ echo " * domserver...........: AX_VAR_EXPAND($domserver_root)"
382380
echo " - bin..............: AX_VAR_EXPAND($domserver_bindir)"
383381
echo " - etc..............: AX_VAR_EXPAND($domserver_etcdir)"
384382
echo " - lib..............: AX_VAR_EXPAND($domserver_libdir)"
385-
echo " - libvendor........: AX_VAR_EXPAND($domserver_libvendordir)"
386383
echo " - log..............: AX_VAR_EXPAND($domserver_logdir)"
387384
echo " - run..............: AX_VAR_EXPAND($domserver_rundir)"
388385
echo " - sql..............: AX_VAR_EXPAND($domserver_sqldir)"

etc/domserver-static.php.in

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,13 @@
77

88
define('DOMJUDGE_VERSION', '@DOMJUDGE_VERSION@');
99

10-
define('BINDIR', '@domserver_bindir@');
11-
define('ETCDIR', '@domserver_etcdir@');
12-
define('WEBAPPDIR', '@domserver_webappdir@');
13-
define('LIBDIR', '@domserver_libdir@');
14-
define('SQLDIR', '@domserver_sqldir@');
15-
define('LIBVENDORDIR','@domserver_libvendordir@');
16-
define('LOGDIR', '@domserver_logdir@');
17-
define('RUNDIR', '@domserver_rundir@');
18-
define('TMPDIR', '@domserver_tmpdir@');
10+
define('BINDIR', '@domserver_bindir@');
11+
define('ETCDIR', '@domserver_etcdir@');
12+
define('WEBAPPDIR', '@domserver_webappdir@');
13+
define('LIBDIR', '@domserver_libdir@');
14+
define('SQLDIR', '@domserver_sqldir@');
15+
define('LOGDIR', '@domserver_logdir@');
16+
define('RUNDIR', '@domserver_rundir@');
17+
define('TMPDIR', '@domserver_tmpdir@');
1918

20-
define('BASEURL', '@BASEURL@');
19+
define('BASEURL', '@BASEURL@');

paths.mk.in

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ domserver_etcdir = @domserver_etcdir@
8686
domserver_webappdir = @domserver_webappdir@
8787
domserver_sqldir = @domserver_sqldir@
8888
domserver_libdir = @domserver_libdir@
89-
domserver_libvendordir = @domserver_libvendordir@
9089
domserver_logdir = @domserver_logdir@
9190
domserver_rundir = @domserver_rundir@
9291
domserver_tmpdir = @domserver_tmpdir@
@@ -111,8 +110,7 @@ systemd_unitdir = @systemd_unitdir@
111110
# The tmpdir's are not in these lists, since they would otherwise get
112111
# their permissions overwritten in FHS install mode.
113112
domserver_dirs = $(domserver_bindir) $(domserver_etcdir) \
114-
$(domserver_libdir) $(domserver_libvendordir) \
115-
$(domserver_logdir) $(domserver_rundir) \
113+
$(domserver_libdir) $(domserver_logdir) $(domserver_rundir) \
116114
$(addprefix $(domserver_webappdir)/public/images/,affiliations countries teams) \
117115
$(domserver_exampleprobdir) $(domserver_databasedumpdir)
118116

@@ -137,7 +135,6 @@ define substconfigvars
137135
-e 's,@domserver_webappdir[@],@domserver_webappdir@,g' \
138136
-e 's,@domserver_sqldir[@],@domserver_sqldir@,g' \
139137
-e 's,@domserver_libdir[@],@domserver_libdir@,g' \
140-
-e 's,@domserver_libvendordir[@],@domserver_libvendordir@,g' \
141138
-e 's,@domserver_logdir[@],@domserver_logdir@,g' \
142139
-e 's,@domserver_rundir[@],@domserver_rundir@,g' \
143140
-e 's,@domserver_tmpdir[@],@domserver_tmpdir@,g' \

0 commit comments

Comments
 (0)