DESTDIR is the correct name

build.sh

@@ -11,7 +11,7 @@ SOLOS=$(uname -s)
 SOLVER=$(uname -r)
 SYSTYPE="${SOLOS}-${SOLVER}"
 
-DISTDIR="${WORLD_ROOT}/dist"
+DEST_DIR="${WORLD_ROOT}/dist"
 
 export ARCHIE_ROOT=${ARCHIE_ROOT}
 export PROSPERO_ROOT=${PROSPERO_ROOT}
@@ -20,10 +20,10 @@ export TCL_ROOT=${TCL_ROOT}
 export TCLDP_ROOT=${TCLDP_ROOT}
 export TK_ROOT=${TK_ROOT}
 export SYSTYPE=${SYSTYPE}
-export DISTDIR=${DISTDIR}
-export PATH=${DISTDIR}/bin:${PATH}
+export DEST_DIR=${DEST_DIR}
+export PATH=${DEST_DIR}/bin:${PATH}
 
-mkdir -p ${DISTDIR}/{bin,pfs}
+mkdir -p ${DEST_DIR}/{bin,pfs}
 
 echo " Build Root      : ${WORLD_ROOT}"
 echo " Archie Root     : ${ARCHIE_ROOT}"
@@ -33,7 +33,7 @@ echo " Tcl Root        : ${TCL_ROOT}"
 echo " Tcl DP Root     : ${TCLDP_ROOT}"
 echo " Tk Root         : ${TK_ROOT}"
 echo " System Type     : ${SYSTYPE}"
-echo " Dist Dir        : ${DISTDIR}"
+echo " Dist Dir        : ${DEST_DIR}"
 
 echo ""
 echo "===================================================================="
@@ -41,7 +41,7 @@ echo " Building ${TCL_ROOT}/unix"
 echo "===================================================================="
 echo ""
 cd ${TCL_ROOT}/unix
-./configure --prefix=${DISTDIR}
+./configure --prefix=${DEST_DIR}
 make
 make install
 cd ${WORLD_ROOT}
@@ -53,7 +53,7 @@ echo " Building ${TK_ROOT}/unix"
 echo "===================================================================="
 echo ""
 cd ${TK_ROOT}/unix
-./configure --prefix=${DISTDIR}
+./configure --prefix=${DEST_DIR}
 make
 make install
 cd ${WORLD_ROOT}
@@ -64,7 +64,7 @@ echo " Building ${TCLDP_ROOT}/unix"
 echo "===================================================================="
 echo ""
 cd ${TCLDP_ROOT}/unix
-./configure --prefix=${DISTDIR}
+./configure --prefix=${DEST_DIR}
 make
 cd ${WORLD_ROOT}
 
@@ -120,6 +120,6 @@ ln -sf Makefile.config.${SYSTYPE} Makefile.config
 cp Makefile.in Makefile
 make all_depend
 make all
-make install
+DESTDIR=${DEST_DIR} make install
 cd ${WORLD_ROOT}
 

prospero/Makefile.config.aix-2

@@ -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'
 
-# DISTDIR =
+DISTDIR =
 
 #### TOPDIR
 # The top of the Prospero data files.  You will only use this if you're

prospero/Makefile.config.dist

@@ -160,7 +160,7 @@ OPTIONAL_LIB_SUBDIRS =
 
 # These options are used only by 'make install' and 'make installbinaries'
 
-# DISTDIR =
+DESTDIR =
 
 #### TOPDIR
 # The top of the Prospero data files.  You will only use this if you're

prospero/Makefile.config.sunos-4.1.3

@@ -161,7 +161,7 @@ COMPILER_PREPENDS_C_SYMBOLS_WITH_UNDERSCORE=_
 
 # These options are used only by 'make install' and 'make installbinaries'
 
-# DISTDIR =
+DESTDIR =
 
 #### TOPDIR
 # The top of the Prospero data files.  You will only use this if you're

prospero/Makefile.config.sunos-4.1.3_u1

@@ -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'
 
-# DISTDIR =
+DESTDIR =
 
 #### TOPDIR
 # The top of the Prospero data files.  You will only use this if you're

prospero/Makefile.config.sunos-5.3

@@ -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'
 
-# DISTDIR =
+DESTDIR =
 
 #### TOPDIR
 # The top of the Prospero data files.  You will only use this if you're
@@ -172,7 +172,7 @@ TOPDIR  = /pfs
 #### P_BINARIES:
 # Location where Prospero binaries should be put by the 'install' target.
 
-P_BINARIES	= $(TOPDIR)/bin
+P_BINARIES	= $(DESTDIR)/$(TOPDIR)/bin
 
 #### PROSPERO_ROOT
 # 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.
 #### This is used by the 'installdirs' dependency.
 
-PSRV_SHADOW=$(DISTDIR)/$(TOPDIR)/shadow 
-PSRV_STORAGE=$(DISTDIR)/$(TOPDIR)/pfsdat
-PSRV_SECURITY=$(DISTDIR)/$(TOPDIR)/security 
+PSRV_SHADOW=$(TOPDIR)/shadow 
+PSRV_STORAGE=$(TOPDIR)/pfsdat
+PSRV_SECURITY=$(TOPDIR)/security 
 
 
 

prospero/app/Makefile.in

@@ -53,8 +53,8 @@ all:	${PROGS}
 
 install:
 	-for i in ${PROGS} ; do \
-	    ${INSTALL} -c -m 755 -o ${OWNER} -g ${GROUP} $${i} ${DISTDIR}/${P_BINARIES}/$${i}${GENERATIONSUFFIX} ;\
-	    ${GENERATION} ${DISTDIR}/${P_BINARIES}/$${i} ;\
+	    ${INSTALL} -c -m 755 -o ${OWNER} -g ${GROUP} $${i} ${P_BINARIES}/$${i}${GENERATIONSUFFIX} ;\
+	    ${GENERATION} ${P_BINARIES}/$${i} ;\
 	done 
 
 # dependencies of all and OTHERPROGS

prospero/lib/ardp/Makefile.in

@@ -66,8 +66,8 @@ OBJECTS = ardp_abort.o \
 all:	${RDP_LIB}
 
 install:
-	cp ${RDP_LIB} ${DISTDIR}/${P_BINARIES}/${RDP_LIB}
-	$(RANLIB) ${DISTDIR}/${P_BINARIES}/${RDP_LIB}
+	cp ${RDP_LIB} ${P_BINARIES}/${RDP_LIB}
+	$(RANLIB) ${P_BINARIES}/${RDP_LIB}
 
 ${RDP_LIB}: ${OBJECTS}
 	rm -f ${RDP_LIB}

prospero/lib/filters/Makefile.in

@@ -22,8 +22,8 @@ ${FIL_LIB}: ${OBJECTS}
 
 install:
 
-#	cp ${FIL_LIB} ${DISTDIR}/${P_BINARIES}/${FIL_LIB}
-#	$(RANLIB) ${DISTDIR}/${P_BINARIES}/${FIL_LIB}
+#	cp ${FIL_LIB} ${P_BINARIES}/${FIL_LIB}
+#	$(RANLIB) ${P_BINARIES}/${FIL_LIB}
 
 # Dependencies
 nl_apply_fil.o : \

prospero/lib/pcompat/Makefile.in

@@ -48,8 +48,8 @@ ${CMP_LIB}: ${OBJECTS}
 
 install:
 
-#	$(INSTALL) -o $(OWNER) -g $(GROUP) ${CMP_LIB} ${DISTDIR}/${P_BINARIES}/${CMP_LIB}
-#	ranlib ${DISTDIR}/${P_BINARIES}/${CMP_LIB}
+#	$(INSTALL) -o $(OWNER) -g $(GROUP) ${CMP_LIB} ${P_BINARIES}/${CMP_LIB}
+#	ranlib ${P_BINARIES}/${CMP_LIB}
 
 
 # Dependencies

prospero/lib/pfs/Makefile.in

@@ -238,8 +238,8 @@ SPECIAL_OTHERTARGETS = $(PFS_LIB)
 
 install:
 # We currently don't install this library
-#	cp ${PFS_LIB} ${DISTDIR}/${P_BINARIES}/${PFS_LIB}
-#	$(RANLIB) ${DISTDIR}/${P_BINARIES}/${PFS_LIB}
+#	cp ${PFS_LIB} ${P_BINARIES}/${PFS_LIB}
+#	$(RANLIB) ${P_BINARIES}/${PFS_LIB}
 
 ${PFS_LIB}: ${OBJECTS}
 	rm -f ${PFS_LIB}

prospero/lib/psrv/Makefile.in

@@ -57,8 +57,8 @@ all:	${SRV_LIB} all_subdirs
 
 install:
 
-#	cp ${SRV_LIB} ${DISTDIR}/${P_BINARIES}/${SRV_LIB}
-#	${RANLIB} ${DISTDIR}/${P_BINARIES}/${SRV_LIB}
+#	cp ${SRV_LIB} ${P_BINARIES}/${SRV_LIB}
+#	${RANLIB} ${P_BINARIES}/${SRV_LIB}
 
 
 ${SRV_LIB}: ${OBJECTS}

prospero/lib/psrv/wais_gw/Makefile.in

@@ -86,8 +86,8 @@ ${WAIS_GW_LIB}: ${OBJS} ${UTIL} ${GW}
 
 install:	sourceparse ietftypes
 	-for i in sourceparse ietftypes ; do \
-	    ${INSTALL} -c -m 755 -o ${OWNER} -g ${GROUP} $$i ${DISTDIR}/${P_BINARIES}/$$i${GENERATIONSUFFIX}; \
-	    ${GENERATION} ${DISTDIR}/${P_BINARIES}/$$i ; \
+	    ${INSTALL} -c -m 755 -o ${OWNER} -g ${GROUP} $$i ${P_BINARIES}/$$i${GENERATIONSUFFIX}; \
+	    ${GENERATION} ${P_BINARIES}/$$i ; \
     	done 
 
 

prospero/server/Makefile.in

@@ -73,10 +73,10 @@ shadowcvt: shadowcvt.o cvt_v1_ltype.o $(SRV_LIBS_DEPENDENCIES)
 
 install:
 	-for i in ${SPECIAL_PROGS} ${MORE_SERVER_PROGS}; do \
-	    ${INSTALL} -c  -m 755 -o ${OWNER} -g ${GROUP} $$i ${DISTDIR}/${P_BINARIES}/$$i${GENERATIONSUFFIX}; \
-	    ${GENERATION} ${DISTDIR}/${P_BINARIES}/$$i ; \
+	    ${INSTALL} -c  -m 755 -o ${OWNER} -g ${GROUP} $$i ${P_BINARIES}/$$i${GENERATIONSUFFIX}; \
+	    ${GENERATION} ${P_BINARIES}/$$i ; \
     	done 
-	-chmod 6755 ${DISTDIR}/${P_BINARIES}/pstart 
+	-chmod 6755 ${P_BINARIES}/pstart 
 
 # Dependencies
 cvt_v1_ltype.o : ../include/pserver.h \

prospero/user/Makefile.in

@@ -76,16 +76,16 @@ all:	$(PROGS) $(SPECIAL_PROGS) $(DATA_FILE_TARGETS) $(MORE_USER_PROGS) all_subdi
 
 install:
 	-for i in $(PROGS) $(SPECIAL_PROGS) $(MORE_USER_PROGS); do \
-	    $(INSTALL) -c -m 755 -o $(OWNER) -g $(GROUP) $$(i) $(DISTDIR)/$(P_BINARIES)/$$(i)$(GENERATIONSUFFIX) ;\
-	    $(GENERATION) $(DISTDIR)/$(P_BINARIES)/$$(i) ;\
+	    $(INSTALL) -c -m 755 -o $(OWNER) -g $(GROUP) $$(i) $(P_BINARIES)/$$(i)$(GENERATIONSUFFIX) ;\
+	    $(GENERATION) $(P_BINARIES)/$$(i) ;\
 	done 
-	-rm -f $(DISTDIR)/$(P_BINARIES)/pkl
-	-ln padmin $(DISTDIR)/$(P_BINARIES)/pkl
-	-rm -f $(DISTDIR)/$(P_BINARIES)/ppw
-	-ln psession $(DISTDIR)/$(P_BINARIES)/ppw
+	-rm -f $(P_BINARIES)/pkl
+	-ln padmin $(P_BINARIES)/pkl
+	-rm -f $(P_BINARIES)/ppw
+	-ln psession $(P_BINARIES)/ppw
 	-for i in $(DATA_FILE_TARGETS)  ; do \
-	    $(INSTALL) -m 644 -o $(OWNER) -g $(GROUP) $$(i) $(DISTDIR)/$(P_BINARIES)/$$(i)$(GENERATIONSUFFIX) ;\
-	    $(GENERATION) $(DISTDIR)/$(P_BINARIES)/$$(i) ;\
+	    $(INSTALL) -m 644 -o $(OWNER) -g $(GROUP) $$(i) $(P_BINARIES)/$$(i)$(GENERATIONSUFFIX) ;\
+	    $(GENERATION) $(P_BINARIES)/$$(i) ;\
 	done
 	$(SUBDIRS_MAKE_START) install $(SUBDIRS_MAKE_END) 
 

prospero/user/menu/Makefile.in

@@ -23,8 +23,8 @@ ${MENU_LIB}: ${OBJECTS}
 	$(RANLIB) ${MENU_LIB}
 
 install:
-	-${INSTALL} -c -m $(INSTALL_EXE_MODE) -o ${OWNER} -g ${GROUP} menu ${DISTDIR}/${P_BINARIES}/menu${GENERATIONSUFFIX} 
-	-${GENERATION} ${DISTDIR}/${P_BINARIES}/menu
+	-${INSTALL} -c -m $(INSTALL_EXE_MODE) -o ${OWNER} -g ${GROUP} menu ${P_BINARIES}/menu${GENERATIONSUFFIX} 
+	-${GENERATION} ${P_BINARIES}/menu
 
 
 # Dependencies

prospero/user/vcache/Makefile.in

@@ -67,8 +67,8 @@ vcache:	$(XLIBOBJECTS) $(PFS_VCACHE_LIBS_DEPENDENCIES)
 
 install:
 	${INSTALL} -c -o ${OWNER} -g ${GROUP} -m $(INSTALL_EXE_MODE)  vcache \
-		${DISTDIR}/${P_BINARIES}/vcache${GENERATIONSUFFIX}
-	${GENERATION} ${DISTDIR}/${P_BINARIES}/vcache
+		${P_BINARIES}/vcache${GENERATIONSUFFIX}
+	${GENERATION} ${P_BINARIES}/vcache
 
 #       This library is not generally installed.
 #	${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 644 ${VCACHE_LIB} \