add DESTDIR install to prospero

2024-05-27 20:18:02 +02:00
parent 48c34d8fdb
commit 211e8efbc2
41 changed files with 2367 additions and 28 deletions
--- a/prospero/Makefile.config.aix-2
+++ b/prospero/Makefile.config.aix-2
@@ -160,6 +160,8 @@ OPTIONAL_LIB_SUBDIRS = lib/psrv/wais_gw lib/psrv/gopher_gw

 # These options are used only by 'make install' and 'make installbinaries'

+# DISTDIR =
+
 #### TOPDIR
 # The top of the Prospero data files.  You will only use this if you're
 # running the Prospero server.
--- a/prospero/Makefile.config.dist
+++ b/prospero/Makefile.config.dist
@@ -160,6 +160,8 @@ OPTIONAL_LIB_SUBDIRS =

 # These options are used only by 'make install' and 'make installbinaries'

+# DISTDIR =
+
 #### TOPDIR
 # The top of the Prospero data files.  You will only use this if you're
 # running the Prospero server.
--- a/prospero/Makefile.config.sunos-4.1.3
+++ b/prospero/Makefile.config.sunos-4.1.3
@@ -161,6 +161,8 @@ COMPILER_PREPENDS_C_SYMBOLS_WITH_UNDERSCORE=_

 # These options are used only by 'make install' and 'make installbinaries'

+# DISTDIR =
+
 #### TOPDIR
 # The top of the Prospero data files.  You will only use this if you're
 # running the Prospero server.
--- a/prospero/Makefile.config.sunos-4.1.3_u1
+++ b/prospero/Makefile.config.sunos-4.1.3_u1
@@ -161,6 +161,8 @@ 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 =
+
 #### TOPDIR
 # The top of the Prospero data files.  You will only use this if you're
 # running the Prospero server.
--- a/prospero/Makefile.config.sunos-5.3
+++ b/prospero/Makefile.config.sunos-5.3
@@ -161,6 +161,8 @@ OPTIONAL_LIB_SUBDIRS = lib/psrv/wais_gw lib/psrv/gopher_gw

 # These options are used only by 'make install' and 'make installbinaries'

+# DESTDIR =
+
 #### TOPDIR
 # The top of the Prospero data files.  You will only use this if you're
 # running the Prospero server.
--- a/prospero/app/Makefile.in
+++ b/prospero/app/Makefile.in
@@ -53,8 +53,8 @@ all:	${PROGS}

 install:
 	-for i in ${PROGS} ; do \
-X	    ${INSTALL} -c -m 755 -o ${OWNER} -g ${GROUP} $${i} ${P_BINARIES}/$${i}${GENERATIONSUFFIX} ;\
-	    ${GENERATION} ${P_BINARIES}/$${i} ;\
+	    ${INSTALL} -c -m 755 -o ${OWNER} -g ${GROUP} $${i} ${DISTDIR}/${P_BINARIES}/$${i}${GENERATIONSUFFIX} ;\
+	    ${GENERATION} ${DISTDIR}/${P_BINARIES}/$${i} ;\
 	done 

 # dependencies of all and OTHERPROGS
--- a/prospero/lib/ardp/Makefile.in
+++ b/prospero/lib/ardp/Makefile.in
@@ -66,8 +66,8 @@ OBJECTS = ardp_abort.o \
 all:	${RDP_LIB}

 install:
-	cp ${RDP_LIB} ${P_BINARIES}/${RDP_LIB}
-	$(RANLIB) ${P_BINARIES}/${RDP_LIB}
+	cp ${RDP_LIB} ${DISTDIR}/${P_BINARIES}/${RDP_LIB}
+	$(RANLIB) ${DISTDIR}/${P_BINARIES}/${RDP_LIB}

 ${RDP_LIB}: ${OBJECTS}
 	rm -f ${RDP_LIB}
--- a/prospero/lib/filters/Makefile.in
+++ b/prospero/lib/filters/Makefile.in
@@ -22,8 +22,8 @@ ${FIL_LIB}: ${OBJECTS}

 install:

-#	cp ${FIL_LIB} ${P_BINARIES}/${FIL_LIB}
-#	$(RANLIB) ${P_BINARIES}/${FIL_LIB}
+#	cp ${FIL_LIB} ${DISTDIR}/${P_BINARIES}/${FIL_LIB}
+#	$(RANLIB) ${DISTDIR}/${P_BINARIES}/${FIL_LIB}

 # Dependencies
 nl_apply_fil.o : \
--- a/prospero/lib/pcompat/Makefile.in
+++ b/prospero/lib/pcompat/Makefile.in
@@ -48,8 +48,8 @@ ${CMP_LIB}: ${OBJECTS}

 install:

-#	$(INSTALL) -o $(OWNER) -g $(GROUP) ${CMP_LIB} ${P_BINARIES}/${CMP_LIB}
-#	ranlib ${P_BINARIES}/${CMP_LIB}
+#	$(INSTALL) -o $(OWNER) -g $(GROUP) ${CMP_LIB} ${DISTDIR}/${P_BINARIES}/${CMP_LIB}
+#	ranlib ${DISTDIR}/${P_BINARIES}/${CMP_LIB}


 # Dependencies
--- a/prospero/lib/pfs/Makefile.in
+++ b/prospero/lib/pfs/Makefile.in
@@ -238,8 +238,8 @@ SPECIAL_OTHERTARGETS = $(PFS_LIB)

 install:
 # We currently don't install this library
-#	cp ${PFS_LIB} ${P_BINARIES}/${PFS_LIB}
-#	$(RANLIB) ${P_BINARIES}/${PFS_LIB}
+#	cp ${PFS_LIB} ${DISTDIR}/${P_BINARIES}/${PFS_LIB}
+#	$(RANLIB) ${DISTDIR}/${P_BINARIES}/${PFS_LIB}

 ${PFS_LIB}: ${OBJECTS}
 	rm -f ${PFS_LIB}
--- a/prospero/lib/psrv/Makefile.in
+++ b/prospero/lib/psrv/Makefile.in
@@ -57,8 +57,8 @@ all:	${SRV_LIB} all_subdirs

 install:

-#	cp ${SRV_LIB} ${P_BINARIES}/${SRV_LIB}
-#	${RANLIB} ${P_BINARIES}/${SRV_LIB}
+#	cp ${SRV_LIB} ${DISTDIR}/${P_BINARIES}/${SRV_LIB}
+#	${RANLIB} ${DISTDIR}/${P_BINARIES}/${SRV_LIB}


 ${SRV_LIB}: ${OBJECTS}
--- a/prospero/lib/psrv/wais_gw/Makefile.in
+++ b/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 ${P_BINARIES}/$$i${GENERATIONSUFFIX}; \
-	    ${GENERATION} ${P_BINARIES}/$$i ; \
+	    ${INSTALL} -c -m 755 -o ${OWNER} -g ${GROUP} $$i ${DISTDIR}/${P_BINARIES}/$$i${GENERATIONSUFFIX}; \
+	    ${GENERATION} ${DISTDIR}/${P_BINARIES}/$$i ; \
    	done 


--- a/prospero/server/Makefile.in
+++ b/prospero/server/Makefile.in
@@ -73,8 +73,8 @@ 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 ${P_BINARIES}/$$i${GENERATIONSUFFIX}; \
-	    ${GENERATION} ${P_BINARIES}/$$i ; \
+	    ${INSTALL} -c  -m 755 -o ${OWNER} -g ${GROUP} $$i ${DISTDIR}/${P_BINARIES}/$$i${GENERATIONSUFFIX}; \
+	    ${GENERATION} ${DISTDIR}/${P_BINARIES}/$$i ; \
    	done 
 	-chmod 6755 ${P_BINARIES}/pstart 

--- a/prospero/user/Makefile.in
+++ b/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) $(P_BINARIES)/$$(i)$(GENERATIONSUFFIX) ;\
-	    $(GENERATION) $(P_BINARIES)/$$(i) ;\
+	    $(INSTALL) -c -m 755 -o $(OWNER) -g $(GROUP) $$(i) $(DISTDIR)/$(P_BINARIES)/$$(i)$(GENERATIONSUFFIX) ;\
+	    $(GENERATION) $(DISTDIR)/$(P_BINARIES)/$$(i) ;\
 	done 
-	-rm -f $(P_BINARIES)/pkl
-	-ln $(P_BINARIES)/padmin $(P_BINARIES)/pkl
-	-rm -f $(P_BINARIES)/ppw
-	-ln $(P_BINARIES)/psession $(P_BINARIES)/ppw
+	-rm -f $(DISTDIR)/$(P_BINARIES)/pkl
+	-ln padmin $(DISTDIR)/$(P_BINARIES)/pkl
+	-rm -f $(DISTDIR)/$(P_BINARIES)/ppw
+	-ln psession $(DISTDIR)/$(P_BINARIES)/ppw
 	-for i in $(DATA_FILE_TARGETS)  ; do \
-	    $(INSTALL) -m 644 -o $(OWNER) -g $(GROUP) $$(i) $(P_BINARIES)/$$(i)$(GENERATIONSUFFIX) ;\
-	    $(GENERATION) $(P_BINARIES)/$$(i) ;\
+	    $(INSTALL) -m 644 -o $(OWNER) -g $(GROUP) $$(i) $(DISTDIR)/$(P_BINARIES)/$$(i)$(GENERATIONSUFFIX) ;\
+	    $(GENERATION) $(DISTDIR)/$(P_BINARIES)/$$(i) ;\
 	done
 	$(SUBDIRS_MAKE_START) install $(SUBDIRS_MAKE_END) 

--- a/prospero/user/menu/Makefile.in
+++ b/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 ${P_BINARIES}/menu${GENERATIONSUFFIX} 
-	-${GENERATION} ${P_BINARIES}/menu
+	-${INSTALL} -c -m $(INSTALL_EXE_MODE) -o ${OWNER} -g ${GROUP} menu ${DISTDIR}/${P_BINARIES}/menu${GENERATIONSUFFIX} 
+	-${GENERATION} ${DISTDIR}/${P_BINARIES}/menu


 # Dependencies
--- a/prospero/user/vcache/Makefile.in
+++ b/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 \
-		${P_BINARIES}/vcache${GENERATIONSUFFIX}
-	${GENERATION} ${P_BINARIES}/vcache
+		${DISTDIR}/${P_BINARIES}/vcache${GENERATIONSUFFIX}
+	${GENERATION} ${DISTDIR}/${P_BINARIES}/vcache

 #       This library is not generally installed.
 #	${INSTALL} -c -o ${OWNER} -g ${GROUP} -m 644 ${VCACHE_LIB} \