Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

improvements on the installation procedures:

Browse source 
- prefix as make variable accepted
- all installation directories created
- www docroot is passed to the storageServer configure script as well
This commit is contained in:
maroy 2005-09-23 14:04:56 +00:00
parent a80f585f5a
commit 39be3f99e3
18 changed files with 65 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

16
livesupport/etc/Makefile.in
View file

@ -54,7 +54,10 @@ prefix = @prefix@
USR_DIR = ${prefix} USR_DIR = ${prefix}
USR_BIN_DIR = ${USR_DIR}/bin USR_BIN_DIR = ${USR_DIR}/bin
USR_DOC_DIR = ${USR_DIR}/doc
USR_ETC_DIR = ${USR_DIR}/etc USR_ETC_DIR = ${USR_DIR}/etc
USR_LIB_DIR = ${USR_DIR}/lib
USR_VAR_DIR = ${USR_DIR}/var
HOSTNAME = @HOSTNAME@ HOSTNAME = @HOSTNAME@
APACHE_GROUP = @APACHE_GROUP@ APACHE_GROUP = @APACHE_GROUP@
@ -314,6 +317,7 @@ ${TMP_DIR}/modules_setup.stamp:
./configure --prefix=${prefix} \ ./configure --prefix=${prefix} \
--with-apache-group=${APACHE_GROUP} \ --with-apache-group=${APACHE_GROUP} \
--with-hostname=${HOSTNAME} \ --with-hostname=${HOSTNAME} \
--with-www-docroot=${WWW_DOCROOT} \
--with-www-port=${WWW_PORT} \ --with-www-port=${WWW_PORT} \
--with-scheduler-port=${SCHEDULER_PORT} \ --with-scheduler-port=${SCHEDULER_PORT} \
--with-database-server=${DB_SERVER} \ --with-database-server=${DB_SERVER} \
@ -426,9 +430,10 @@ check:
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# Installation related targets # 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 ${MKDIR} ${USR_ETC_DIR}/apache
${CP} ${ETC_DIR}/apache/*.conf ${USR_ETC_DIR}/apache ${CP} ${ETC_DIR}/apache/*.conf ${USR_ETC_DIR}/apache
${MKDIR} ${USR_BIN_DIR} ${MKDIR} ${USR_BIN_DIR}
@ -444,6 +449,13 @@ ifeq (@CREATE_LS_DATABASE@,yes)
--dbpassword=${DB_PASSWORD} --dbpassword=${DB_PASSWORD}
endif 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: install_modules:
${MAKE} -C ${ALIB_DIR} install ${MAKE} -C ${ALIB_DIR} install
${MAKE} -C ${ARCHIVE_SERVER_DIR} install ${MAKE} -C ${ARCHIVE_SERVER_DIR} install

4
livesupport/modules/alib/etc/Makefile.in
View file

@ -59,7 +59,9 @@ SRC_DIR = ${BASE_DIR}/src
TMP_DIR = ${BASE_DIR}/tmp TMP_DIR = ${BASE_DIR}/tmp
VAR_DIR = ${BASE_DIR}/var VAR_DIR = ${BASE_DIR}/var
USR_DIR = @prefix@ prefix = @prefix@
USR_DIR = ${prefix}
USR_INCLUDE_DIR = ${USR_DIR}/include USR_INCLUDE_DIR = ${USR_DIR}/include
USR_VAR_DIR = ${USR_DIR}/var USR_VAR_DIR = ${USR_DIR}/var

4
livesupport/modules/archiveServer/etc/Makefile.in
View file

@ -62,7 +62,9 @@ SRC_DIR = ${BASE_DIR}/src
TMP_DIR = ${BASE_DIR}/tmp TMP_DIR = ${BASE_DIR}/tmp
VAR_DIR = ${BASE_DIR}/var VAR_DIR = ${BASE_DIR}/var
USR_DIR = @prefix@ prefix = @prefix@
USR_DIR = ${prefix}
USR_INCLUDE_DIR = ${USR_DIR}/include USR_INCLUDE_DIR = ${USR_DIR}/include
USR_LIB_DIR = ${USR_DIR}/lib USR_LIB_DIR = ${USR_DIR}/lib
USR_VAR_DIR = ${USR_DIR}/var USR_VAR_DIR = ${USR_DIR}/var

4
livesupport/modules/authentication/etc/Makefile.in
View file

@ -50,7 +50,9 @@ LIB_DIR = ${BASE_DIR}/lib
SRC_DIR = ${BASE_DIR}/src SRC_DIR = ${BASE_DIR}/src
TMP_DIR = ${BASE_DIR}/tmp TMP_DIR = ${BASE_DIR}/tmp
USR_DIR = @prefix@ prefix = @prefix@
USR_DIR = ${prefix}
USR_INCLUDE_DIR = ${USR_DIR}/include USR_INCLUDE_DIR = ${USR_DIR}/include
USR_LIB_DIR = ${USR_DIR}/lib USR_LIB_DIR = ${USR_DIR}/lib
BOOST_INCLUDE_DIR = ${USR_INCLUDE_DIR}/boost-1_31 BOOST_INCLUDE_DIR = ${USR_INCLUDE_DIR}/boost-1_31

4
livesupport/modules/core/etc/Makefile.in
View file

@ -53,7 +53,9 @@ SRC_DIR = ${BASE_DIR}/src
TMP_DIR = ${BASE_DIR}/tmp TMP_DIR = ${BASE_DIR}/tmp
VAR_DIR = ${BASE_DIR}/var VAR_DIR = ${BASE_DIR}/var
USR_DIR = @prefix@ prefix = @prefix@
USR_DIR = ${prefix}
USR_INCLUDE_DIR = ${USR_DIR}/include USR_INCLUDE_DIR = ${USR_DIR}/include
USR_BIN_DIR = ${USR_DIR}/bin USR_BIN_DIR = ${USR_DIR}/bin
USR_LIB_DIR = ${USR_DIR}/lib USR_LIB_DIR = ${USR_DIR}/lib

4
livesupport/modules/db/etc/Makefile.in
View file

@ -51,7 +51,9 @@ LIB_DIR = ${BASE_DIR}/lib
SRC_DIR = ${BASE_DIR}/src SRC_DIR = ${BASE_DIR}/src
TMP_DIR = ${BASE_DIR}/tmp TMP_DIR = ${BASE_DIR}/tmp
USR_DIR = @prefix@ prefix = @prefix@
USR_DIR = ${prefix}
USR_INCLUDE_DIR = ${USR_DIR}/include USR_INCLUDE_DIR = ${USR_DIR}/include
USR_LIB_DIR = ${USR_DIR}/lib USR_LIB_DIR = ${USR_DIR}/lib
BOOST_INCLUDE_DIR = ${USR_INCLUDE_DIR}/boost-1_31 BOOST_INCLUDE_DIR = ${USR_INCLUDE_DIR}/boost-1_31

4
livesupport/modules/eventScheduler/etc/Makefile.in
View file

@ -50,7 +50,9 @@ LIB_DIR = ${BASE_DIR}/lib
SRC_DIR = ${BASE_DIR}/src SRC_DIR = ${BASE_DIR}/src
TMP_DIR = ${BASE_DIR}/tmp TMP_DIR = ${BASE_DIR}/tmp
USR_DIR = @prefix@ prefix = @prefix@
USR_DIR = ${prefix}
USR_INCLUDE_DIR = ${USR_DIR}/include USR_INCLUDE_DIR = ${USR_DIR}/include
USR_LIB_DIR = ${USR_DIR}/lib USR_LIB_DIR = ${USR_DIR}/lib
BOOST_INCLUDE_DIR = ${USR_INCLUDE_DIR}/boost-1_31 BOOST_INCLUDE_DIR = ${USR_INCLUDE_DIR}/boost-1_31

4
livesupport/modules/getid3/etc/Makefile.in
View file

@ -60,7 +60,9 @@ SRC_DIR = ${BASE_DIR}/src
TMP_DIR = ${BASE_DIR}/tmp TMP_DIR = ${BASE_DIR}/tmp
VAR_DIR = ${BASE_DIR}/var VAR_DIR = ${BASE_DIR}/var
USR_DIR = @prefix@ prefix = @prefix@
USR_DIR = ${prefix}
USR_INCLUDE_DIR = ${USR_DIR}/include USR_INCLUDE_DIR = ${USR_DIR}/include
USR_VAR_DIR = ${USR_DIR}/var USR_VAR_DIR = ${USR_DIR}/var

4
livesupport/modules/gstreamerElements/etc/Makefile.in
View file

@ -56,7 +56,9 @@ VAR_DIR = ${BASE_DIR}/var
REAL_BASE_DIR=$(shell cd ${BASE_DIR}; pwd) REAL_BASE_DIR=$(shell cd ${BASE_DIR}; pwd)
USR_DIR = @prefix@ prefix = @prefix@
USR_DIR = ${prefix}
USR_INCLUDE_DIR = ${USR_DIR}/include USR_INCLUDE_DIR = ${USR_DIR}/include
USR_BIN_DIR = ${USR_DIR}/bin USR_BIN_DIR = ${USR_DIR}/bin
USR_LIB_DIR = ${USR_DIR}/lib USR_LIB_DIR = ${USR_DIR}/lib

4
livesupport/modules/htmlUI/etc/Makefile.in
View file

@ -61,7 +61,9 @@ SRC_DIR = ${BASE_DIR}/src
TMP_DIR = ${BASE_DIR}/tmp TMP_DIR = ${BASE_DIR}/tmp
VAR_DIR = ${BASE_DIR}/var VAR_DIR = ${BASE_DIR}/var
USR_DIR = @prefix@ prefix = @prefix@
USR_DIR = ${prefix}
USR_INCLUDE_DIR = ${USR_DIR}/include USR_INCLUDE_DIR = ${USR_DIR}/include
USR_VAR_DIR = ${USR_DIR}/var USR_VAR_DIR = ${USR_DIR}/var

4
livesupport/modules/playlistExecutor/etc/Makefile.in
View file

@ -53,7 +53,9 @@ TMP_DIR = ${BASE_DIR}/tmp
REAL_BASE_DIR=$(shell cd ${BASE_DIR}; pwd) REAL_BASE_DIR=$(shell cd ${BASE_DIR}; pwd)
USR_DIR = @prefix@ prefix = @prefix@
USR_DIR = ${prefix}
USR_INCLUDE_DIR = ${USR_DIR}/include USR_INCLUDE_DIR = ${USR_DIR}/include
USR_LIB_DIR = ${USR_DIR}/lib USR_LIB_DIR = ${USR_DIR}/lib
BOOST_INCLUDE_DIR = ${USR_INCLUDE_DIR}/boost-1_31 BOOST_INCLUDE_DIR = ${USR_INCLUDE_DIR}/boost-1_31

4
livesupport/modules/schedulerClient/etc/Makefile.in
View file

@ -50,7 +50,9 @@ LIB_DIR = ${BASE_DIR}/lib
SRC_DIR = ${BASE_DIR}/src SRC_DIR = ${BASE_DIR}/src
TMP_DIR = ${BASE_DIR}/tmp TMP_DIR = ${BASE_DIR}/tmp
USR_DIR = @prefix@ prefix = @prefix@
USR_DIR = ${prefix}
USR_INCLUDE_DIR = ${USR_DIR}/include USR_INCLUDE_DIR = ${USR_DIR}/include
USR_LIB_DIR = ${USR_DIR}/lib USR_LIB_DIR = ${USR_DIR}/lib
BOOST_INCLUDE_DIR = ${USR_INCLUDE_DIR}/boost-1_31 BOOST_INCLUDE_DIR = ${USR_INCLUDE_DIR}/boost-1_31

4
livesupport/modules/storage/etc/Makefile.in
View file

@ -50,7 +50,9 @@ LIB_DIR = ${BASE_DIR}/lib
SRC_DIR = ${BASE_DIR}/src SRC_DIR = ${BASE_DIR}/src
TMP_DIR = ${BASE_DIR}/tmp TMP_DIR = ${BASE_DIR}/tmp
USR_DIR = @prefix@ prefix = @prefix@
USR_DIR = ${prefix}
USR_INCLUDE_DIR = ${USR_DIR}/include USR_INCLUDE_DIR = ${USR_DIR}/include
USR_LIB_DIR = ${USR_DIR}/lib USR_LIB_DIR = ${USR_DIR}/lib
BOOST_INCLUDE_DIR = ${USR_INCLUDE_DIR}/boost-1_31 BOOST_INCLUDE_DIR = ${USR_INCLUDE_DIR}/boost-1_31

4
livesupport/modules/storageAdmin/etc/Makefile.in
View file

@ -64,7 +64,9 @@ TMP_DIR = ${BASE_DIR}/tmp
VAR_DIR = ${BASE_DIR}/var VAR_DIR = ${BASE_DIR}/var
BIN_DIR = ${BASE_DIR}/bin BIN_DIR = ${BASE_DIR}/bin
USR_DIR = @prefix@ prefix = @prefix@
USR_DIR = ${prefix}
USR_INCLUDE_DIR = ${USR_DIR}/include USR_INCLUDE_DIR = ${USR_DIR}/include
USR_VAR_DIR = ${USR_DIR}/var USR_VAR_DIR = ${USR_DIR}/var

4
livesupport/modules/storageServer/etc/Makefile.in
View file

@ -64,7 +64,9 @@ SRC_DIR = ${BASE_DIR}/src
TMP_DIR = ${BASE_DIR}/tmp TMP_DIR = ${BASE_DIR}/tmp
VAR_DIR = ${BASE_DIR}/var VAR_DIR = ${BASE_DIR}/var
USR_DIR = @prefix@ prefix = @prefix@
USR_DIR = ${prefix}
USR_INCLUDE_DIR = ${USR_DIR}/include USR_INCLUDE_DIR = ${USR_DIR}/include
USR_LIB_DIR = ${USR_DIR}/lib USR_LIB_DIR = ${USR_DIR}/lib
USR_VAR_DIR = ${USR_DIR}/var USR_VAR_DIR = ${USR_DIR}/var

4
livesupport/modules/widgets/etc/Makefile.in
View file

@ -53,7 +53,9 @@ SRC_DIR = ${BASE_DIR}/src
TMP_DIR = ${BASE_DIR}/tmp TMP_DIR = ${BASE_DIR}/tmp
VAR_DIR = ${BASE_DIR}/var VAR_DIR = ${BASE_DIR}/var
USR_DIR = @prefix@ prefix = @prefix@
USR_DIR = ${prefix}
USR_INCLUDE_DIR = ${USR_DIR}/include USR_INCLUDE_DIR = ${USR_DIR}/include
USR_BIN_DIR = ${USR_DIR}/bin USR_BIN_DIR = ${USR_DIR}/bin
USR_LIB_DIR = ${USR_DIR}/lib USR_LIB_DIR = ${USR_DIR}/lib

4
livesupport/products/gLiveSupport/etc/Makefile.in
View file

@ -58,7 +58,9 @@ VAR_DIR = ${BASE_DIR}/var
REAL_BASE_DIR=$(shell cd ${BASE_DIR}; pwd) REAL_BASE_DIR=$(shell cd ${BASE_DIR}; pwd)
USR_DIR = @prefix@ prefix = @prefix@
USR_DIR = ${prefix}
USR_BIN_DIR = ${USR_DIR}/bin USR_BIN_DIR = ${USR_DIR}/bin
USR_ETC_DIR = ${USR_DIR}/etc USR_ETC_DIR = ${USR_DIR}/etc
USR_INCLUDE_DIR = ${USR_DIR}/include USR_INCLUDE_DIR = ${USR_DIR}/include

4
livesupport/products/scheduler/etc/Makefile.in
View file

@ -56,7 +56,9 @@ TMP_DIR = ${BASE_DIR}/tmp
REAL_BASE_DIR=$(shell cd ${BASE_DIR}; pwd) REAL_BASE_DIR=$(shell cd ${BASE_DIR}; pwd)
USR_DIR = @prefix@ prefix = @prefix@
USR_DIR = ${prefix}
USR_BIN_DIR = ${USR_DIR}/bin USR_BIN_DIR = ${USR_DIR}/bin
USR_ETC_DIR = ${USR_DIR}/etc USR_ETC_DIR = ${USR_DIR}/etc
USR_INCLUDE_DIR = ${USR_DIR}/include USR_INCLUDE_DIR = ${USR_DIR}/include