Cosmetic changes.

1 files changed, 23 insertions, 29 deletions

diff --git a/lang/smalleiffel/Makefile b/lang/smalleiffel/Makefile
index b6e418a552e..734c1b8dca8 100644
--- a/lang/smalleiffel/Makefile
+++ b/lang/smalleiffel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2000/02/25 05:11:58 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2000/02/25 06:18:08 jlam Exp $
 #
 
 DISTNAME=	se
@@ -18,10 +18,10 @@ MAKE_ENV+=	SmallEiffel=${WRKSRC}/sys/system.se
 ALL_TARGET=	./bin/compile_to_c
 
 DIST_SUBDIR=	${PKGNAME}
-DOCDIR=		share/doc/smalleiffel
-EGDIR=		share/examples/smalleiffel
-LIBDIR=		share/smalleiffel
-LIBEXECDIR=	libexec/smalleiffel
+DOCDIR=		${PREFIX}/share/doc/smalleiffel
+EGDIR=		${PREFIX}/share/examples/smalleiffel
+LIBDIR=		${PREFIX}/share/smalleiffel
+LIBEXECDIR=	${PREFIX}/libexec/smalleiffel
 
 post-extract:
 	${FIND} ${WRKSRC} -type f -print0 | xargs -0 ${CHMOD} 644
@@ -30,10 +30,10 @@ post-patch:
 	${CHMOD} +x ${WRKSRC}/misc/GC.SH
 
 post-build:
-	${SED}	-e "s,@@SE_LIB@@,${PREFIX}/${LIBDIR},g" \
-		-e "s,@@SE_LIBEXEC@@,${PREFIX}/${LIBEXECDIR},g" \
+	${SED}	-e "s,@@SE_LIB@@,${LIBDIR},g" \
+		-e "s,@@SE_LIBEXEC@@,${LIBEXECDIR},g" \
 		${FILESDIR}/smalleiffel.sh > ${WRKDIR}/smalleiffel.sh
-	${SED}	-e "s,@@SE_LIB@@,${PREFIX}/${LIBDIR},g" \
+	${SED}	-e "s,@@SE_LIB@@,${LIBDIR},g" \
 		${FILESDIR}/loadpath.UNIX.in > ${WRKDIR}/loadpath.UNIX
 
 pre-install:
@@ -44,34 +44,28 @@ pre-install:
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/smalleiffel.sh ${PREFIX}/bin/smalleiffel
 
-	${INSTALL_PROGRAM_DIR} ${PREFIX}/${LIBEXECDIR}
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/* ${PREFIX}/${LIBEXECDIR}
+	${INSTALL_PROGRAM_DIR} ${LIBEXECDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/* ${LIBEXECDIR}
 
-	${INSTALL_DATA_DIR} ${PREFIX}/${LIBDIR}
+	${INSTALL_DATA_DIR} ${LIBDIR}
 	cd ${WRKSRC}; for dir in \
 	    lib_iterator lib_number lib_random lib_se lib_std short sys; do \
-		${PAX} -rw $${dir} ${PREFIX}/${LIBDIR}; \
+		${PAX} -rw $${dir} ${LIBDIR}; \
 	done
-	${INSTALL_DATA} ${WRKDIR}/loadpath.UNIX ${PREFIX}/${LIBDIR}/sys
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/${LIBDIR}
+	${INSTALL_DATA} ${WRKDIR}/loadpath.UNIX ${LIBDIR}/sys
+	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${LIBDIR}
 
-	${INSTALL_DATA_DIR} ${PREFIX}/${DOCDIR}
-	${INSTALL_DATA} \
-		${WRKSRC}/COPYING \
-		${WRKSRC}/misc/WeNeedFeedBack.txt \
-		${PREFIX}/${DOCDIR}
-	cd ${WRKSRC}/misc; \
-		${INSTALL_DATA} \
-			HISTORY.html NOT_YET_IMPLEMENTED.html \
-			THANKS.html people.html \
-			${PREFIX}/${DOCDIR}
-	cd ${WRKSRC}/man; \
-		${INSTALL_DATA} Eiffel.FAQ *.html *.gif ${PREFIX}/${DOCDIR}
+	${INSTALL_DATA_DIR} ${DOCDIR}
+	cd ${WRKSRC}; ${INSTALL_DATA} COPYING misc/WeNeedFeedBack.txt ${DOCDIR}
+	cd ${WRKSRC}/misc; ${INSTALL_DATA} \
+		HISTORY.html NOT_YET_IMPLEMENTED.html THANKS.html people.html \
+		${DOCDIR}
+	cd ${WRKSRC}/man; ${INSTALL_DATA} Eiffel.FAQ *.html *.gif ${DOCDIR}
 
-	${INSTALL_DATA_DIR} ${PREFIX}/${EGDIR}
+	${INSTALL_DATA_DIR} ${EGDIR}
 	cd ${WRKSRC}; for dir in contrib lib_show; do \
-		${PAX} -rw $${dir} ${PREFIX}/${EGDIR}; \
+		${PAX} -rw $${dir} ${EGDIR}; \
 	done
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/${EGDIR}
+	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${EGDIR}
 
 .include "../../mk/bsd.pkg.mk"