From 39be3f99e35b659f06cc850275573ac2ebdbe563 Mon Sep 17 00:00:00 2001 From: maroy Date: Fri, 23 Sep 2005 14:04:56 +0000 Subject: [PATCH] improvements on the installation procedures: - prefix as make variable accepted - all installation directories created - www docroot is passed to the storageServer configure script as well --- livesupport/etc/Makefile.in | 16 ++++++++++++++-- livesupport/modules/alib/etc/Makefile.in | 4 +++- .../modules/archiveServer/etc/Makefile.in | 4 +++- .../modules/authentication/etc/Makefile.in | 4 +++- livesupport/modules/core/etc/Makefile.in | 4 +++- livesupport/modules/db/etc/Makefile.in | 4 +++- .../modules/eventScheduler/etc/Makefile.in | 4 +++- livesupport/modules/getid3/etc/Makefile.in | 4 +++- .../modules/gstreamerElements/etc/Makefile.in | 4 +++- livesupport/modules/htmlUI/etc/Makefile.in | 4 +++- .../modules/playlistExecutor/etc/Makefile.in | 4 +++- .../modules/schedulerClient/etc/Makefile.in | 4 +++- livesupport/modules/storage/etc/Makefile.in | 4 +++- livesupport/modules/storageAdmin/etc/Makefile.in | 4 +++- .../modules/storageServer/etc/Makefile.in | 4 +++- livesupport/modules/widgets/etc/Makefile.in | 4 +++- .../products/gLiveSupport/etc/Makefile.in | 4 +++- livesupport/products/scheduler/etc/Makefile.in | 4 +++- 18 files changed, 65 insertions(+), 19 deletions(-) diff --git a/livesupport/etc/Makefile.in b/livesupport/etc/Makefile.in index dd9009e93..ad140be0c 100644 --- a/livesupport/etc/Makefile.in +++ b/livesupport/etc/Makefile.in @@ -54,7 +54,10 @@ prefix = @prefix@ USR_DIR = ${prefix} USR_BIN_DIR = ${USR_DIR}/bin +USR_DOC_DIR = ${USR_DIR}/doc USR_ETC_DIR = ${USR_DIR}/etc +USR_LIB_DIR = ${USR_DIR}/lib +USR_VAR_DIR = ${USR_DIR}/var HOSTNAME = @HOSTNAME@ APACHE_GROUP = @APACHE_GROUP@ @@ -314,6 +317,7 @@ ${TMP_DIR}/modules_setup.stamp: ./configure --prefix=${prefix} \ --with-apache-group=${APACHE_GROUP} \ --with-hostname=${HOSTNAME} \ + --with-www-docroot=${WWW_DOCROOT} \ --with-www-port=${WWW_PORT} \ --with-scheduler-port=${SCHEDULER_PORT} \ --with-database-server=${DB_SERVER} \ @@ -426,9 +430,10 @@ check: #------------------------------------------------------------------------------- # Installation related targets #------------------------------------------------------------------------------- -.PHONY: install create_database install_modules install_products +.PHONY: install create_database setup_install_dirs +.PHONY: install_modules install_products -install: setup compile create_database install_modules install_products +install: setup compile setup_install_dirs create_database install_modules install_products ${MKDIR} ${USR_ETC_DIR}/apache ${CP} ${ETC_DIR}/apache/*.conf ${USR_ETC_DIR}/apache ${MKDIR} ${USR_BIN_DIR} @@ -444,6 +449,13 @@ ifeq (@CREATE_LS_DATABASE@,yes) --dbpassword=${DB_PASSWORD} endif +setup_install_dirs: + ${MKDIR} ${USR_BIN_DIR} + ${MKDIR} ${USR_DOC_DIR} + ${MKDIR} ${USR_ETC_DIR} + ${MKDIR} ${USR_LIB_DIR} + ${MKDIR} ${USR_VAR_DIR} + install_modules: ${MAKE} -C ${ALIB_DIR} install ${MAKE} -C ${ARCHIVE_SERVER_DIR} install diff --git a/livesupport/modules/alib/etc/Makefile.in b/livesupport/modules/alib/etc/Makefile.in index 8c76a2d64..3422ffb90 100644 --- a/livesupport/modules/alib/etc/Makefile.in +++ b/livesupport/modules/alib/etc/Makefile.in @@ -59,7 +59,9 @@ SRC_DIR = ${BASE_DIR}/src TMP_DIR = ${BASE_DIR}/tmp VAR_DIR = ${BASE_DIR}/var -USR_DIR = @prefix@ +prefix = @prefix@ + +USR_DIR = ${prefix} USR_INCLUDE_DIR = ${USR_DIR}/include USR_VAR_DIR = ${USR_DIR}/var diff --git a/livesupport/modules/archiveServer/etc/Makefile.in b/livesupport/modules/archiveServer/etc/Makefile.in index b0fc2a3e4..2e3c8581a 100644 --- a/livesupport/modules/archiveServer/etc/Makefile.in +++ b/livesupport/modules/archiveServer/etc/Makefile.in @@ -62,7 +62,9 @@ SRC_DIR = ${BASE_DIR}/src TMP_DIR = ${BASE_DIR}/tmp VAR_DIR = ${BASE_DIR}/var -USR_DIR = @prefix@ +prefix = @prefix@ + +USR_DIR = ${prefix} USR_INCLUDE_DIR = ${USR_DIR}/include USR_LIB_DIR = ${USR_DIR}/lib USR_VAR_DIR = ${USR_DIR}/var diff --git a/livesupport/modules/authentication/etc/Makefile.in b/livesupport/modules/authentication/etc/Makefile.in index 3ef6c8bb2..da1016d4b 100644 --- a/livesupport/modules/authentication/etc/Makefile.in +++ b/livesupport/modules/authentication/etc/Makefile.in @@ -50,7 +50,9 @@ LIB_DIR = ${BASE_DIR}/lib SRC_DIR = ${BASE_DIR}/src TMP_DIR = ${BASE_DIR}/tmp -USR_DIR = @prefix@ +prefix = @prefix@ + +USR_DIR = ${prefix} USR_INCLUDE_DIR = ${USR_DIR}/include USR_LIB_DIR = ${USR_DIR}/lib BOOST_INCLUDE_DIR = ${USR_INCLUDE_DIR}/boost-1_31 diff --git a/livesupport/modules/core/etc/Makefile.in b/livesupport/modules/core/etc/Makefile.in index 4ab8a0f9a..634b21f7e 100644 --- a/livesupport/modules/core/etc/Makefile.in +++ b/livesupport/modules/core/etc/Makefile.in @@ -53,7 +53,9 @@ SRC_DIR = ${BASE_DIR}/src TMP_DIR = ${BASE_DIR}/tmp VAR_DIR = ${BASE_DIR}/var -USR_DIR = @prefix@ +prefix = @prefix@ + +USR_DIR = ${prefix} USR_INCLUDE_DIR = ${USR_DIR}/include USR_BIN_DIR = ${USR_DIR}/bin USR_LIB_DIR = ${USR_DIR}/lib diff --git a/livesupport/modules/db/etc/Makefile.in b/livesupport/modules/db/etc/Makefile.in index 4a2d3881e..83ac430ff 100644 --- a/livesupport/modules/db/etc/Makefile.in +++ b/livesupport/modules/db/etc/Makefile.in @@ -51,7 +51,9 @@ LIB_DIR = ${BASE_DIR}/lib SRC_DIR = ${BASE_DIR}/src TMP_DIR = ${BASE_DIR}/tmp -USR_DIR = @prefix@ +prefix = @prefix@ + +USR_DIR = ${prefix} USR_INCLUDE_DIR = ${USR_DIR}/include USR_LIB_DIR = ${USR_DIR}/lib BOOST_INCLUDE_DIR = ${USR_INCLUDE_DIR}/boost-1_31 diff --git a/livesupport/modules/eventScheduler/etc/Makefile.in b/livesupport/modules/eventScheduler/etc/Makefile.in index 195685ad5..46b56e8ac 100644 --- a/livesupport/modules/eventScheduler/etc/Makefile.in +++ b/livesupport/modules/eventScheduler/etc/Makefile.in @@ -50,7 +50,9 @@ LIB_DIR = ${BASE_DIR}/lib SRC_DIR = ${BASE_DIR}/src TMP_DIR = ${BASE_DIR}/tmp -USR_DIR = @prefix@ +prefix = @prefix@ + +USR_DIR = ${prefix} USR_INCLUDE_DIR = ${USR_DIR}/include USR_LIB_DIR = ${USR_DIR}/lib BOOST_INCLUDE_DIR = ${USR_INCLUDE_DIR}/boost-1_31 diff --git a/livesupport/modules/getid3/etc/Makefile.in b/livesupport/modules/getid3/etc/Makefile.in index ed6fdfc58..078aad126 100644 --- a/livesupport/modules/getid3/etc/Makefile.in +++ b/livesupport/modules/getid3/etc/Makefile.in @@ -60,7 +60,9 @@ SRC_DIR = ${BASE_DIR}/src TMP_DIR = ${BASE_DIR}/tmp VAR_DIR = ${BASE_DIR}/var -USR_DIR = @prefix@ +prefix = @prefix@ + +USR_DIR = ${prefix} USR_INCLUDE_DIR = ${USR_DIR}/include USR_VAR_DIR = ${USR_DIR}/var diff --git a/livesupport/modules/gstreamerElements/etc/Makefile.in b/livesupport/modules/gstreamerElements/etc/Makefile.in index d43114a3c..72edf0923 100644 --- a/livesupport/modules/gstreamerElements/etc/Makefile.in +++ b/livesupport/modules/gstreamerElements/etc/Makefile.in @@ -56,7 +56,9 @@ VAR_DIR = ${BASE_DIR}/var REAL_BASE_DIR=$(shell cd ${BASE_DIR}; pwd) -USR_DIR = @prefix@ +prefix = @prefix@ + +USR_DIR = ${prefix} USR_INCLUDE_DIR = ${USR_DIR}/include USR_BIN_DIR = ${USR_DIR}/bin USR_LIB_DIR = ${USR_DIR}/lib diff --git a/livesupport/modules/htmlUI/etc/Makefile.in b/livesupport/modules/htmlUI/etc/Makefile.in index 0cf1a4931..0afc15e29 100644 --- a/livesupport/modules/htmlUI/etc/Makefile.in +++ b/livesupport/modules/htmlUI/etc/Makefile.in @@ -61,7 +61,9 @@ SRC_DIR = ${BASE_DIR}/src TMP_DIR = ${BASE_DIR}/tmp VAR_DIR = ${BASE_DIR}/var -USR_DIR = @prefix@ +prefix = @prefix@ + +USR_DIR = ${prefix} USR_INCLUDE_DIR = ${USR_DIR}/include USR_VAR_DIR = ${USR_DIR}/var diff --git a/livesupport/modules/playlistExecutor/etc/Makefile.in b/livesupport/modules/playlistExecutor/etc/Makefile.in index 08dc525de..1c52d6afd 100644 --- a/livesupport/modules/playlistExecutor/etc/Makefile.in +++ b/livesupport/modules/playlistExecutor/etc/Makefile.in @@ -53,7 +53,9 @@ TMP_DIR = ${BASE_DIR}/tmp REAL_BASE_DIR=$(shell cd ${BASE_DIR}; pwd) -USR_DIR = @prefix@ +prefix = @prefix@ + +USR_DIR = ${prefix} USR_INCLUDE_DIR = ${USR_DIR}/include USR_LIB_DIR = ${USR_DIR}/lib BOOST_INCLUDE_DIR = ${USR_INCLUDE_DIR}/boost-1_31 diff --git a/livesupport/modules/schedulerClient/etc/Makefile.in b/livesupport/modules/schedulerClient/etc/Makefile.in index e510640dc..1efe283cc 100644 --- a/livesupport/modules/schedulerClient/etc/Makefile.in +++ b/livesupport/modules/schedulerClient/etc/Makefile.in @@ -50,7 +50,9 @@ LIB_DIR = ${BASE_DIR}/lib SRC_DIR = ${BASE_DIR}/src TMP_DIR = ${BASE_DIR}/tmp -USR_DIR = @prefix@ +prefix = @prefix@ + +USR_DIR = ${prefix} USR_INCLUDE_DIR = ${USR_DIR}/include USR_LIB_DIR = ${USR_DIR}/lib BOOST_INCLUDE_DIR = ${USR_INCLUDE_DIR}/boost-1_31 diff --git a/livesupport/modules/storage/etc/Makefile.in b/livesupport/modules/storage/etc/Makefile.in index 50e2936e0..81d3e6139 100644 --- a/livesupport/modules/storage/etc/Makefile.in +++ b/livesupport/modules/storage/etc/Makefile.in @@ -50,7 +50,9 @@ LIB_DIR = ${BASE_DIR}/lib SRC_DIR = ${BASE_DIR}/src TMP_DIR = ${BASE_DIR}/tmp -USR_DIR = @prefix@ +prefix = @prefix@ + +USR_DIR = ${prefix} USR_INCLUDE_DIR = ${USR_DIR}/include USR_LIB_DIR = ${USR_DIR}/lib BOOST_INCLUDE_DIR = ${USR_INCLUDE_DIR}/boost-1_31 diff --git a/livesupport/modules/storageAdmin/etc/Makefile.in b/livesupport/modules/storageAdmin/etc/Makefile.in index 568838964..3b3090d28 100644 --- a/livesupport/modules/storageAdmin/etc/Makefile.in +++ b/livesupport/modules/storageAdmin/etc/Makefile.in @@ -64,7 +64,9 @@ TMP_DIR = ${BASE_DIR}/tmp VAR_DIR = ${BASE_DIR}/var BIN_DIR = ${BASE_DIR}/bin -USR_DIR = @prefix@ +prefix = @prefix@ + +USR_DIR = ${prefix} USR_INCLUDE_DIR = ${USR_DIR}/include USR_VAR_DIR = ${USR_DIR}/var diff --git a/livesupport/modules/storageServer/etc/Makefile.in b/livesupport/modules/storageServer/etc/Makefile.in index 3bb70a1fa..8e94c29b8 100644 --- a/livesupport/modules/storageServer/etc/Makefile.in +++ b/livesupport/modules/storageServer/etc/Makefile.in @@ -64,7 +64,9 @@ SRC_DIR = ${BASE_DIR}/src TMP_DIR = ${BASE_DIR}/tmp VAR_DIR = ${BASE_DIR}/var -USR_DIR = @prefix@ +prefix = @prefix@ + +USR_DIR = ${prefix} USR_INCLUDE_DIR = ${USR_DIR}/include USR_LIB_DIR = ${USR_DIR}/lib USR_VAR_DIR = ${USR_DIR}/var diff --git a/livesupport/modules/widgets/etc/Makefile.in b/livesupport/modules/widgets/etc/Makefile.in index f4e8dfe47..367c0f3bb 100644 --- a/livesupport/modules/widgets/etc/Makefile.in +++ b/livesupport/modules/widgets/etc/Makefile.in @@ -53,7 +53,9 @@ SRC_DIR = ${BASE_DIR}/src TMP_DIR = ${BASE_DIR}/tmp VAR_DIR = ${BASE_DIR}/var -USR_DIR = @prefix@ +prefix = @prefix@ + +USR_DIR = ${prefix} USR_INCLUDE_DIR = ${USR_DIR}/include USR_BIN_DIR = ${USR_DIR}/bin USR_LIB_DIR = ${USR_DIR}/lib diff --git a/livesupport/products/gLiveSupport/etc/Makefile.in b/livesupport/products/gLiveSupport/etc/Makefile.in index d58895840..893f8204d 100644 --- a/livesupport/products/gLiveSupport/etc/Makefile.in +++ b/livesupport/products/gLiveSupport/etc/Makefile.in @@ -58,7 +58,9 @@ VAR_DIR = ${BASE_DIR}/var REAL_BASE_DIR=$(shell cd ${BASE_DIR}; pwd) -USR_DIR = @prefix@ +prefix = @prefix@ + +USR_DIR = ${prefix} USR_BIN_DIR = ${USR_DIR}/bin USR_ETC_DIR = ${USR_DIR}/etc USR_INCLUDE_DIR = ${USR_DIR}/include diff --git a/livesupport/products/scheduler/etc/Makefile.in b/livesupport/products/scheduler/etc/Makefile.in index 857101017..c72205956 100644 --- a/livesupport/products/scheduler/etc/Makefile.in +++ b/livesupport/products/scheduler/etc/Makefile.in @@ -56,7 +56,9 @@ TMP_DIR = ${BASE_DIR}/tmp REAL_BASE_DIR=$(shell cd ${BASE_DIR}; pwd) -USR_DIR = @prefix@ +prefix = @prefix@ + +USR_DIR = ${prefix} USR_BIN_DIR = ${USR_DIR}/bin USR_ETC_DIR = ${USR_DIR}/etc USR_INCLUDE_DIR = ${USR_DIR}/include