Use ``DESTDIR''. Make the world safe for distributions!

SCCS-vsn: usr.bin/pascal/pc0/Makefile 1.13
SCCS-vsn: usr.bin/pascal/src/pimakefile 1.13

diff --git a/usr/src/usr.bin/pascal/pc0/Makefile b/usr/src/usr.bin/pascal/pc0/Makefile
index 330f0df..98279ef 100644 (file)
--- a/usr/src/usr.bin/pascal/pc0/Makefile
+++ b/usr/src/usr.bin/pascal/pc0/Makefile
@@ -1,6 +1,6 @@
-SCCSID = "@(#)Makefile 1.12 %G%"
+SCCSID = "@(#)Makefile 1.13 %G%"

 WHOAMI = pc
 WHOAMI = pc

-INSTALLNAME = /usr/lib/pc0
+INSTALLNAME = $(DESTDIR)/usr/lib/pc0

 VERSION = 2.0
 
 MKSTR = /usr/ucb/mkstr
 VERSION = 2.0
 
 MKSTR = /usr/ucb/mkstr


@@ -13,7 +13,7 @@ LDFLAGS = -z
 
 SRCDIR = /usr/src/cmd/pc0
 INSTALLDIR = /usr/ucb
 
 SRCDIR = /usr/src/cmd/pc0
 INSTALLDIR = /usr/ucb

-LIBDIR = /usr/lib
+LIBDIR = ${DESTDIR}/usr/lib

 TMPDIR = tmp
 
 ERRORSTRINGS = pi2.0strings
 TMPDIR = tmp
 
 ERRORSTRINGS = pi2.0strings


@@ -92,7 +92,6 @@ clean:
        ${RM} version Version.c
        ${RM} a.out core *.list *.bak
        ${RM} opc.c opc pic tags
        ${RM} version Version.c
        ${RM} a.out core *.list *.bak
        ${RM} opc.c opc pic tags

-       sccs clean

 
 print: sources
        @pr makefile READ_ME
 
 print: sources
        @pr makefile READ_ME


@@ -106,7 +105,6 @@ print:      sources
        @pr yy.h yy*.c
 
 install: a.out
        @pr yy.h yy*.c
 
 install: a.out

-       sccs check

        cp ${ERRORSTRINGS} ${LIBDIR}/${ERRORSTRINGS}
        cp ${INSTALLDIR}/pi ${INSTALLDIR}/pi.bak
        cp a.out ${INSTALLDIR}/pi
        cp ${ERRORSTRINGS} ${LIBDIR}/${ERRORSTRINGS}
        cp ${INSTALLDIR}/pi ${INSTALLDIR}/pi.bak
        cp a.out ${INSTALLDIR}/pi

diff --git a/usr/src/usr.bin/pascal/src/pimakefile b/usr/src/usr.bin/pascal/src/pimakefile
index 47b706b..c07d0e0 100644 (file)
--- a/usr/src/usr.bin/pascal/src/pimakefile
+++ b/usr/src/usr.bin/pascal/src/pimakefile
@@ -1,6 +1,6 @@
-SCCSID = "@(#)pimakefile 1.12 %G%"
+SCCSID = "@(#)pimakefile 1.13 %G%"

 WHOAMI = pi
 WHOAMI = pi

-INSTALLNAME = /usr/ucb/pi
+INSTALLNAME = ${DESTDIR}/usr/ucb/pi

 VERSION = 2.0
 
 MKSTR = /usr/ucb/mkstr
 VERSION = 2.0
 
 MKSTR = /usr/ucb/mkstr


@@ -13,7 +13,7 @@ LDFLAGS = -z
 
 SRCDIR = /usr/src/cmd/pc0
 INSTALLDIR = /usr/ucb
 
 SRCDIR = /usr/src/cmd/pc0
 INSTALLDIR = /usr/ucb

-LIBDIR = /usr/lib
+LIBDIR = ${DESTDIR}/usr/lib

 TMPDIR = tmp
 
 ERRORSTRINGS = pi2.0strings
 TMPDIR = tmp
 
 ERRORSTRINGS = pi2.0strings


@@ -92,7 +92,6 @@ clean:
        ${RM} version Version.c
        ${RM} a.out core *.list *.bak
        ${RM} opc.c opc pic tags
        ${RM} version Version.c
        ${RM} a.out core *.list *.bak
        ${RM} opc.c opc pic tags

-       sccs clean

 
 print: sources
        @pr makefile READ_ME
 
 print: sources
        @pr makefile READ_ME


@@ -106,7 +105,6 @@ print:      sources
        @pr yy.h yy*.c
 
 install: a.out
        @pr yy.h yy*.c
 
 install: a.out

-       sccs check

        cp ${ERRORSTRINGS} ${LIBDIR}/${ERRORSTRINGS}
        cp ${INSTALLDIR}/pi ${INSTALLDIR}/pi.bak
        cp a.out ${INSTALLDIR}/pi
        cp ${ERRORSTRINGS} ${LIBDIR}/${ERRORSTRINGS}
        cp ${INSTALLDIR}/pi ${INSTALLDIR}/pi.bak
        cp a.out ${INSTALLDIR}/pi