Skip to content

Commit 889563b

Browse files
committed
Remove option to configure libvendor dir
Default it would be put in the root (see also the commit message about those lines in composer.json) and it makes the most sense to have those relative to the source. @nickygerritsen suggested another place which would also be fine, we should discuss this before merging.
1 parent e1f78ca commit 889563b

File tree

3 files changed

+3
-6
lines changed

3 files changed

+3
-6
lines changed

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,8 @@
144144
"platform": {
145145
"php": "8.1.0"
146146
},
147-
"vendor-dir": "lib/vendor",
148-
"component-dir": "lib/vendor/components",
147+
"vendor-dir": "webapp/vendor",
148+
"component-dir": "webapp/vendor/components",
149149
"allow-plugins": {
150150
"composer/package-versions-deprecated": true,
151151
"symfony/flex": true,

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)"

paths.mk.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ domserver_etcdir = @domserver_etcdir@
8686
domserver_webappdir = @domserver_webappdir@
8787
domserver_sqldir = @domserver_sqldir@
8888
domserver_libdir = @domserver_libdir@
89-
domserver_libvendordir = @domserver_libvendordir@
89+
domserver_libvendordir = @domserver_webappdir@/vendor
9090
domserver_logdir = @domserver_logdir@
9191
domserver_rundir = @domserver_rundir@
9292
domserver_tmpdir = @domserver_tmpdir@

0 commit comments

Comments
 (0)