DESTDIR is the correct name
This commit is contained in:
parent
b0a63f06d5
commit
55a051c9ed
18
build.sh
18
build.sh
@ -11,7 +11,7 @@ SOLOS=$(uname -s)
|
|||||||
SOLVER=$(uname -r)
|
SOLVER=$(uname -r)
|
||||||
SYSTYPE="${SOLOS}-${SOLVER}"
|
SYSTYPE="${SOLOS}-${SOLVER}"
|
||||||
|
|
||||||
DISTDIR="${WORLD_ROOT}/dist"
|
DEST_DIR="${WORLD_ROOT}/dist"
|
||||||
|
|
||||||
export ARCHIE_ROOT=${ARCHIE_ROOT}
|
export ARCHIE_ROOT=${ARCHIE_ROOT}
|
||||||
export PROSPERO_ROOT=${PROSPERO_ROOT}
|
export PROSPERO_ROOT=${PROSPERO_ROOT}
|
||||||
@ -20,10 +20,10 @@ export TCL_ROOT=${TCL_ROOT}
|
|||||||
export TCLDP_ROOT=${TCLDP_ROOT}
|
export TCLDP_ROOT=${TCLDP_ROOT}
|
||||||
export TK_ROOT=${TK_ROOT}
|
export TK_ROOT=${TK_ROOT}
|
||||||
export SYSTYPE=${SYSTYPE}
|
export SYSTYPE=${SYSTYPE}
|
||||||
export DISTDIR=${DISTDIR}
|
export DEST_DIR=${DEST_DIR}
|
||||||
export PATH=${DISTDIR}/bin:${PATH}
|
export PATH=${DEST_DIR}/bin:${PATH}
|
||||||
|
|
||||||
mkdir -p ${DISTDIR}/{bin,pfs}
|
mkdir -p ${DEST_DIR}/{bin,pfs}
|
||||||
|
|
||||||
echo " Build Root : ${WORLD_ROOT}"
|
echo " Build Root : ${WORLD_ROOT}"
|
||||||
echo " Archie Root : ${ARCHIE_ROOT}"
|
echo " Archie Root : ${ARCHIE_ROOT}"
|
||||||
@ -33,7 +33,7 @@ echo " Tcl Root : ${TCL_ROOT}"
|
|||||||
echo " Tcl DP Root : ${TCLDP_ROOT}"
|
echo " Tcl DP Root : ${TCLDP_ROOT}"
|
||||||
echo " Tk Root : ${TK_ROOT}"
|
echo " Tk Root : ${TK_ROOT}"
|
||||||
echo " System Type : ${SYSTYPE}"
|
echo " System Type : ${SYSTYPE}"
|
||||||
echo " Dist Dir : ${DISTDIR}"
|
echo " Dist Dir : ${DEST_DIR}"
|
||||||
|
|
||||||
echo ""
|
echo ""
|
||||||
echo "===================================================================="
|
echo "===================================================================="
|
||||||
@ -41,7 +41,7 @@ echo " Building ${TCL_ROOT}/unix"
|
|||||||
echo "===================================================================="
|
echo "===================================================================="
|
||||||
echo ""
|
echo ""
|
||||||
cd ${TCL_ROOT}/unix
|
cd ${TCL_ROOT}/unix
|
||||||
./configure --prefix=${DISTDIR}
|
./configure --prefix=${DEST_DIR}
|
||||||
make
|
make
|
||||||
make install
|
make install
|
||||||
cd ${WORLD_ROOT}
|
cd ${WORLD_ROOT}
|
||||||
@ -53,7 +53,7 @@ echo " Building ${TK_ROOT}/unix"
|
|||||||
echo "===================================================================="
|
echo "===================================================================="
|
||||||
echo ""
|
echo ""
|
||||||
cd ${TK_ROOT}/unix
|
cd ${TK_ROOT}/unix
|
||||||
./configure --prefix=${DISTDIR}
|
./configure --prefix=${DEST_DIR}
|
||||||
make
|
make
|
||||||
make install
|
make install
|
||||||
cd ${WORLD_ROOT}
|
cd ${WORLD_ROOT}
|
||||||
@ -64,7 +64,7 @@ echo " Building ${TCLDP_ROOT}/unix"
|
|||||||
echo "===================================================================="
|
echo "===================================================================="
|
||||||
echo ""
|
echo ""
|
||||||
cd ${TCLDP_ROOT}/unix
|
cd ${TCLDP_ROOT}/unix
|
||||||
./configure --prefix=${DISTDIR}
|
./configure --prefix=${DEST_DIR}
|
||||||
make
|
make
|
||||||
cd ${WORLD_ROOT}
|
cd ${WORLD_ROOT}
|
||||||
|
|
||||||
@ -120,6 +120,6 @@ ln -sf Makefile.config.${SYSTYPE} Makefile.config
|
|||||||
cp Makefile.in Makefile
|
cp Makefile.in Makefile
|
||||||
make all_depend
|
make all_depend
|
||||||
make all
|
make all
|
||||||
make install
|
DESTDIR=${DEST_DIR} make install
|
||||||
cd ${WORLD_ROOT}
|
cd ${WORLD_ROOT}
|
||||||
|
|
||||||
|
@ -160,7 +160,7 @@ OPTIONAL_LIB_SUBDIRS = lib/psrv/wais_gw lib/psrv/gopher_gw
|
|||||||
|
|
||||||
# These options are used only by 'make install' and 'make installbinaries'
|
# These options are used only by 'make install' and 'make installbinaries'
|
||||||
|
|
||||||
# DISTDIR =
|
DISTDIR =
|
||||||
|
|
||||||
#### TOPDIR
|
#### TOPDIR
|
||||||
# The top of the Prospero data files. You will only use this if you're
|
# The top of the Prospero data files. You will only use this if you're
|
||||||
|
@ -160,7 +160,7 @@ OPTIONAL_LIB_SUBDIRS =
|
|||||||
|
|
||||||
# These options are used only by 'make install' and 'make installbinaries'
|
# These options are used only by 'make install' and 'make installbinaries'
|
||||||
|
|
||||||
# DISTDIR =
|
DESTDIR =
|
||||||
|
|
||||||
#### TOPDIR
|
#### TOPDIR
|
||||||
# The top of the Prospero data files. You will only use this if you're
|
# The top of the Prospero data files. You will only use this if you're
|
||||||
|
@ -161,7 +161,7 @@ COMPILER_PREPENDS_C_SYMBOLS_WITH_UNDERSCORE=_
|
|||||||
|
|
||||||
# These options are used only by 'make install' and 'make installbinaries'
|
# These options are used only by 'make install' and 'make installbinaries'
|
||||||
|
|
||||||
# DISTDIR =
|
DESTDIR =
|
||||||
|
|
||||||
#### TOPDIR
|
#### TOPDIR
|
||||||
# The top of the Prospero data files. You will only use this if you're
|
# The top of the Prospero data files. You will only use this if you're
|
||||||
|
@ -161,7 +161,7 @@ OPTIONAL_LIB_SUBDIRS = lib/psrv/wais_gw lib/pcompat lib/psrv/gopher_gw
|
|||||||
|
|
||||||
# These options are used only by 'make install' and 'make installbinaries'
|
# These options are used only by 'make install' and 'make installbinaries'
|
||||||
|
|
||||||
# DISTDIR =
|
DESTDIR =
|
||||||
|
|
||||||
#### TOPDIR
|
#### TOPDIR
|
||||||
# The top of the Prospero data files. You will only use this if you're
|
# The top of the Prospero data files. You will only use this if you're
|
||||||
|
@ -161,7 +161,7 @@ OPTIONAL_LIB_SUBDIRS = lib/psrv/wais_gw lib/psrv/gopher_gw
|
|||||||
|
|
||||||
# These options are used only by 'make install' and 'make installbinaries'
|
# These options are used only by 'make install' and 'make installbinaries'
|
||||||
|
|
||||||
# DISTDIR =
|
DESTDIR =
|
||||||
|
|
||||||
#### TOPDIR
|
#### TOPDIR
|
||||||
# The top of the Prospero data files. You will only use this if you're
|
# The top of the Prospero data files. You will only use this if you're
|
||||||
@ -172,7 +172,7 @@ TOPDIR = /pfs
|
|||||||
#### P_BINARIES:
|
#### P_BINARIES:
|
||||||
# Location where Prospero binaries should be put by the 'install' target.
|
# Location where Prospero binaries should be put by the 'install' target.
|
||||||
|
|
||||||
P_BINARIES = $(TOPDIR)/bin
|
P_BINARIES = $(DESTDIR)/$(TOPDIR)/bin
|
||||||
|
|
||||||
#### PROSPERO_ROOT
|
#### PROSPERO_ROOT
|
||||||
# The directory in which the top-level Prospero makefile exists. This is the
|
# The directory in which the top-level Prospero makefile exists. This is the
|
||||||
@ -422,9 +422,9 @@ USE_VCACHE_LIBS_DEPENDENCIES = $(PFS_LIBS_DEPENDENCIES)
|
|||||||
#### These are normally not changed.
|
#### These are normally not changed.
|
||||||
#### This is used by the 'installdirs' dependency.
|
#### This is used by the 'installdirs' dependency.
|
||||||
|
|
||||||
PSRV_SHADOW=$(DISTDIR)/$(TOPDIR)/shadow
|
PSRV_SHADOW=$(TOPDIR)/shadow
|
||||||
PSRV_STORAGE=$(DISTDIR)/$(TOPDIR)/pfsdat
|
PSRV_STORAGE=$(TOPDIR)/pfsdat
|
||||||
PSRV_SECURITY=$(DISTDIR)/$(TOPDIR)/security
|
PSRV_SECURITY=$(TOPDIR)/security
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -53,8 +53,8 @@ all: ${PROGS}
|
|||||||
|
|
||||||
install:
|
install:
|
||||||
-for i in ${PROGS} ; do \
|
-for i in ${PROGS} ; do \
|
||||||
${INSTALL} -c -m 755 -o ${OWNER} -g ${GROUP} $${i} ${DISTDIR}/${P_BINARIES}/$${i}${GENERATIONSUFFIX} ;\
|
${INSTALL} -c -m 755 -o ${OWNER} -g ${GROUP} $${i} ${P_BINARIES}/$${i}${GENERATIONSUFFIX} ;\
|
||||||
${GENERATION} ${DISTDIR}/${P_BINARIES}/$${i} ;\
|
${GENERATION} ${P_BINARIES}/$${i} ;\
|
||||||
done
|
done
|
||||||
|
|
||||||
# dependencies of all and OTHERPROGS
|
# dependencies of all and OTHERPROGS
|
||||||
|
@ -66,8 +66,8 @@ OBJECTS = ardp_abort.o \
|
|||||||
all: ${RDP_LIB}
|
all: ${RDP_LIB}
|
||||||
|
|
||||||
install:
|
install:
|
||||||
cp ${RDP_LIB} ${DISTDIR}/${P_BINARIES}/${RDP_LIB}
|
cp ${RDP_LIB} ${P_BINARIES}/${RDP_LIB}
|
||||||
$(RANLIB) ${DISTDIR}/${P_BINARIES}/${RDP_LIB}
|
$(RANLIB) ${P_BINARIES}/${RDP_LIB}
|
||||||
|
|
||||||
${RDP_LIB}: ${OBJECTS}
|
${RDP_LIB}: ${OBJECTS}
|
||||||
rm -f ${RDP_LIB}
|
rm -f ${RDP_LIB}
|
||||||
|
@ -22,8 +22,8 @@ ${FIL_LIB}: ${OBJECTS}
|
|||||||
|
|
||||||
install:
|
install:
|
||||||
|
|
||||||
# cp ${FIL_LIB} ${DISTDIR}/${P_BINARIES}/${FIL_LIB}
|
# cp ${FIL_LIB} ${P_BINARIES}/${FIL_LIB}
|
||||||
# $(RANLIB) ${DISTDIR}/${P_BINARIES}/${FIL_LIB}
|
# $(RANLIB) ${P_BINARIES}/${FIL_LIB}
|
||||||
|
|
||||||
# Dependencies
|
# Dependencies
|
||||||
nl_apply_fil.o : \
|
nl_apply_fil.o : \
|
||||||
|
@ -48,8 +48,8 @@ ${CMP_LIB}: ${OBJECTS}
|
|||||||
|
|
||||||
install:
|
install:
|
||||||
|
|
||||||
# $(INSTALL) -o $(OWNER) -g $(GROUP) ${CMP_LIB} ${DISTDIR}/${P_BINARIES}/${CMP_LIB}
|
# $(INSTALL) -o $(OWNER) -g $(GROUP) ${CMP_LIB} ${P_BINARIES}/${CMP_LIB}
|
||||||
# ranlib ${DISTDIR}/${P_BINARIES}/${CMP_LIB}
|
# ranlib ${P_BINARIES}/${CMP_LIB}
|
||||||
|
|
||||||
|
|
||||||
# Dependencies
|
# Dependencies
|
||||||
|
@ -238,8 +238,8 @@ SPECIAL_OTHERTARGETS = $(PFS_LIB)
|
|||||||
|
|
||||||
install:
|
install:
|
||||||
# We currently don't install this library
|
# We currently don't install this library
|
||||||
# cp ${PFS_LIB} ${DISTDIR}/${P_BINARIES}/${PFS_LIB}
|
# cp ${PFS_LIB} ${P_BINARIES}/${PFS_LIB}
|
||||||
# $(RANLIB) ${DISTDIR}/${P_BINARIES}/${PFS_LIB}
|
# $(RANLIB) ${P_BINARIES}/${PFS_LIB}
|
||||||
|
|
||||||
${PFS_LIB}: ${OBJECTS}
|
${PFS_LIB}: ${OBJECTS}
|
||||||
rm -f ${PFS_LIB}
|
rm -f ${PFS_LIB}
|
||||||
|
@ -57,8 +57,8 @@ all: ${SRV_LIB} all_subdirs
|
|||||||
|
|
||||||
install:
|
install:
|
||||||
|
|
||||||
# cp ${SRV_LIB} ${DISTDIR}/${P_BINARIES}/${SRV_LIB}
|
# cp ${SRV_LIB} ${P_BINARIES}/${SRV_LIB}
|
||||||
# ${RANLIB} ${DISTDIR}/${P_BINARIES}/${SRV_LIB}
|
# ${RANLIB} ${P_BINARIES}/${SRV_LIB}
|
||||||
|
|
||||||
|
|
||||||
${SRV_LIB}: ${OBJECTS}
|
${SRV_LIB}: ${OBJECTS}
|
||||||
|
@ -86,8 +86,8 @@ ${WAIS_GW_LIB}: ${OBJS} ${UTIL} ${GW}
|
|||||||
|
|
||||||
install: sourceparse ietftypes
|
install: sourceparse ietftypes
|
||||||
-for i in sourceparse ietftypes ; do \
|
-for i in sourceparse ietftypes ; do \
|
||||||
${INSTALL} -c -m 755 -o ${OWNER} -g ${GROUP} $$i ${DISTDIR}/${P_BINARIES}/$$i${GENERATIONSUFFIX}; \
|
${INSTALL} -c -m 755 -o ${OWNER} -g ${GROUP} $$i ${P_BINARIES}/$$i${GENERATIONSUFFIX}; \
|
||||||
${GENERATION} ${DISTDIR}/${P_BINARIES}/$$i ; \
|
${GENERATION} ${P_BINARIES}/$$i ; \
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|
||||||
|
@ -73,10 +73,10 @@ shadowcvt: shadowcvt.o cvt_v1_ltype.o $(SRV_LIBS_DEPENDENCIES)
|
|||||||
|
|
||||||
install:
|
install:
|
||||||
-for i in ${SPECIAL_PROGS} ${MORE_SERVER_PROGS}; do \
|
-for i in ${SPECIAL_PROGS} ${MORE_SERVER_PROGS}; do \
|
||||||
${INSTALL} -c -m 755 -o ${OWNER} -g ${GROUP} $$i ${DISTDIR}/${P_BINARIES}/$$i${GENERATIONSUFFIX}; \
|
${INSTALL} -c -m 755 -o ${OWNER} -g ${GROUP} $$i ${P_BINARIES}/$$i${GENERATIONSUFFIX}; \
|
||||||
${GENERATION} ${DISTDIR}/${P_BINARIES}/$$i ; \
|
${GENERATION} ${P_BINARIES}/$$i ; \
|
||||||
done
|
done
|
||||||
-chmod 6755 ${DISTDIR}/${P_BINARIES}/pstart
|
-chmod 6755 ${P_BINARIES}/pstart
|
||||||
|
|
||||||
# Dependencies
|
# Dependencies
|
||||||
cvt_v1_ltype.o : ../include/pserver.h \
|
cvt_v1_ltype.o : ../include/pserver.h \
|
||||||
|
@ -76,16 +76,16 @@ all: $(PROGS) $(SPECIAL_PROGS) $(DATA_FILE_TARGETS) $(MORE_USER_PROGS) all_subdi
|
|||||||
|
|
||||||
install:
|
install:
|
||||||
-for i in $(PROGS) $(SPECIAL_PROGS) $(MORE_USER_PROGS); do \
|
-for i in $(PROGS) $(SPECIAL_PROGS) $(MORE_USER_PROGS); do \
|
||||||
$(INSTALL) -c -m 755 -o $(OWNER) -g $(GROUP) $$(i) $(DISTDIR)/$(P_BINARIES)/$$(i)$(GENERATIONSUFFIX) ;\
|
$(INSTALL) -c -m 755 -o $(OWNER) -g $(GROUP) $$(i) $(P_BINARIES)/$$(i)$(GENERATIONSUFFIX) ;\
|
||||||
$(GENERATION) $(DISTDIR)/$(P_BINARIES)/$$(i) ;\
|
$(GENERATION) $(P_BINARIES)/$$(i) ;\
|
||||||
done
|
done
|
||||||
-rm -f $(DISTDIR)/$(P_BINARIES)/pkl
|
-rm -f $(P_BINARIES)/pkl
|
||||||
-ln padmin $(DISTDIR)/$(P_BINARIES)/pkl
|
-ln padmin $(P_BINARIES)/pkl
|
||||||
-rm -f $(DISTDIR)/$(P_BINARIES)/ppw
|
-rm -f $(P_BINARIES)/ppw
|
||||||
-ln psession $(DISTDIR)/$(P_BINARIES)/ppw
|
-ln psession $(P_BINARIES)/ppw
|
||||||
-for i in $(DATA_FILE_TARGETS) ; do \
|
-for i in $(DATA_FILE_TARGETS) ; do \
|
||||||
$(INSTALL) -m 644 -o $(OWNER) -g $(GROUP) $$(i) $(DISTDIR)/$(P_BINARIES)/$$(i)$(GENERATIONSUFFIX) ;\
|
$(INSTALL) -m 644 -o $(OWNER) -g $(GROUP) $$(i) $(P_BINARIES)/$$(i)$(GENERATIONSUFFIX) ;\
|
||||||
$(GENERATION) $(DISTDIR)/$(P_BINARIES)/$$(i) ;\
|
$(GENERATION) $(P_BINARIES)/$$(i) ;\
|
||||||
done
|
done
|
||||||
$(SUBDIRS_MAKE_START) install $(SUBDIRS_MAKE_END)
|
$(SUBDIRS_MAKE_START) install $(SUBDIRS_MAKE_END)
|
||||||
|
|
||||||
|
@ -23,8 +23,8 @@ ${MENU_LIB}: ${OBJECTS}
|
|||||||
$(RANLIB) ${MENU_LIB}
|
$(RANLIB) ${MENU_LIB}
|
||||||
|
|
||||||
install:
|
install:
|
||||||
-${INSTALL} -c -m $(INSTALL_EXE_MODE) -o ${OWNER} -g ${GROUP} menu ${DISTDIR}/${P_BINARIES}/menu${GENERATIONSUFFIX}
|
-${INSTALL} -c -m $(INSTALL_EXE_MODE) -o ${OWNER} -g ${GROUP} menu ${P_BINARIES}/menu${GENERATIONSUFFIX}
|
||||||
-${GENERATION} ${DISTDIR}/${P_BINARIES}/menu
|
-${GENERATION} ${P_BINARIES}/menu
|
||||||
|
|
||||||
|
|
||||||
# Dependencies
|
# Dependencies
|
||||||
|
@ -67,8 +67,8 @@ vcache: $(XLIBOBJECTS) $(PFS_VCACHE_LIBS_DEPENDENCIES)
|
|||||||
|
|
||||||
install:
|
install:
|
||||||
${INSTALL} -c -o ${OWNER} -g ${GROUP} -m $(INSTALL_EXE_MODE) vcache \
|
${INSTALL} -c -o ${OWNER} -g ${GROUP} -m $(INSTALL_EXE_MODE) vcache \
|
||||||
${DISTDIR}/${P_BINARIES}/vcache${GENERATIONSUFFIX}
|
${P_BINARIES}/vcache${GENERATIONSUFFIX}
|
||||||
${GENERATION} ${DISTDIR}/${P_BINARIES}/vcache
|
${GENERATION} ${P_BINARIES}/vcache
|
||||||
|
|
||||||
# This library is not generally installed.
|
# This library is not generally installed.
|
||||||
# ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 644 ${VCACHE_LIB} \
|
# ${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 644 ${VCACHE_LIB} \
|
||||||
|
Loading…
Reference in New Issue
Block a user