From 8d3276a612a91aa809b992fb0d1a251cbe0b4a74 Mon Sep 17 00:00:00 2001
From: rufustfirefly <rufustfirefly>
Date: Fri, 9 Mar 2001 14:44:47 +0000
Subject: [PATCH] fixes for Solaris build problems, noted by Akop Pogosian
 <akopps@csua.berkeley.edu>

---
 sys/solaris/Makefile | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/sys/solaris/Makefile b/sys/solaris/Makefile
index 95ca2cf2..dca5ba70 100644
--- a/sys/solaris/Makefile
+++ b/sys/solaris/Makefile
@@ -31,7 +31,7 @@ LIBSHARED=      -ldl
 # with 2.5.1.
 # add -DHAVE_IFNAMEINDEX if you're using solaris 8.
 DEFS=	-DNO_STRUCT_TM_GMTOFF -D__svr4__ -DSOLARIS -I../../sys/generic \
-	${OSDEFS} ${MACHINEDEFS}
+	-I.. ${OSDEFS} ${MACHINEDEFS}
 INSTALL=	/usr/ucb/install
 AFPLIBS=
 ADDLIBS=	-lsocket -lnsl
@@ -147,9 +147,10 @@ kinstall : kernel kuninstall
 	-ln -s ../init.d/atalk /etc/rc0.d/K79atalk
 
 install :
-	-mkdir ${DESTDIR} ${SBINDIR} ${BINDIR} ${ETCDIR} ${LIBDIR}
-	sed -e s@:BINDIR:@${BINDIR}@ < ../../lp2pap.sh > ${RESDIR}/lp2pap.sh
-	chmod 744 ${RESDIR}/lp2pap.sh
+	-mkdir ${DESTDIR}${sbindir} ${DESTDIR}${bindir} ${DESTDIR}${CONFIG_DIR} \
+		${DESTDIR}${libdir}
+	sed -e s@:BINDIR:@${prefix}/bin@ < ../../contrib/shell_utils/lp2pap.sh > ${DESTDIR}${RESDIR}/lp2pap.sh
+	chmod 744 ${DESTDIR}${CONFIG_DIR}/lp2pap.sh
 	for i in ${ALL}; \
 	    do (cd $$i; ${MAKE} ${MFLAGS} CC="${CC}" \
 		ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
@@ -163,7 +164,7 @@ install :
 		OSDEFS="$${OSDEFS}" MACHINEDEFS="$${MACHINEDEFS}" \
 		INSTALL="${INSTALL}" $@); \
 	done
-	if [ -f ${ETCDIR}/afpd.conf ]; then \
+	if [ -f ${DESTDIR}${CONFIG_DIR}/afpd.conf ]; then \
 		echo "Retaining old afpd.conf file.";  \
 	else \
 		sed -e s@:DESTDIR:@${DESTDIR}@ -e s@:SBINDIR:@${SBINDIR}@ \
-- 
2.39.2