Skip to content

Commit 0a1e8d8

Browse files
committed
Remove option to configure libvendor dir
I've left it there to make this explicit for people who do care as mentioned in earlier commits.
1 parent dc6239e commit 0a1e8d8

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

configure.ac

Lines changed: 1 addition & 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, $datadir/${PACKAGE_TARNAME}/lib/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)
@@ -223,7 +222,6 @@ AX_PATH(domserver_etcdir, [$domserver_root/etc])
223222
AX_PATH(domserver_webappdir, [$domserver_root/webapp])
224223
AX_PATH(domserver_sqldir, [$domserver_root/sql])
225224
AX_PATH(domserver_libdir, [$domserver_root/lib])
226-
AX_PATH(domserver_libvendordir, [$domserver_root/lib/vendor])
227225
AX_PATH(domserver_logdir, [$domserver_root/log])
228226
AX_PATH(domserver_rundir, [$domserver_root/run])
229227
AX_PATH(domserver_tmpdir, [$domserver_root/tmp])
@@ -384,7 +382,7 @@ echo " * domserver...........: AX_VAR_EXPAND($domserver_root)"
384382
echo " - bin..............: AX_VAR_EXPAND($domserver_bindir)"
385383
echo " - etc..............: AX_VAR_EXPAND($domserver_etcdir)"
386384
echo " - lib..............: AX_VAR_EXPAND($domserver_libdir)"
387-
echo " - libvendor........: AX_VAR_EXPAND($domserver_libvendordir)"
385+
echo " - libvendor........: AX_VAR_EXPAND($domserver_webapp)/vendor"
388386
echo " - log..............: AX_VAR_EXPAND($domserver_logdir)"
389387
echo " - run..............: AX_VAR_EXPAND($domserver_rundir)"
390388
echo " - sql..............: AX_VAR_EXPAND($domserver_sqldir)"

0 commit comments

Comments
 (0)