Changeset 2809


Ignore:
Timestamp:
Jun 16, 2003, 9:50:39 PM (17 years ago)
Author:
ssen
Message:

1) Don't include dports.mk. We don't need it anymore
2) Use $(INSTALL) -d instead of mkdir -p
3) Use $(SILENT) instead of "@" to make quiet execution. You can

override SILENT= on the make command line

4) Don't do sed on prefix.mtree before applying via mtree

Location:
trunk/base/src
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/base/src/cflib1.0/Makefile

    r2770 r2809  
    44INSTALLDIR= ${DESTDIR}${datadir}/darwinports/Tcl/cflib1.0
    55
    6 include ../../Mk/dports.mk
    76include ../../Mk/dports.autoconf.mk
    87include ../../Mk/dports.tea.mk
  • trunk/base/src/darwinports1.0/Makefile

    r2789 r2809  
    33DARWIN_OLD_PKGINDEX=${TCL_PACKAGE_DIR}/8.3/darwinports1.0/pkgIndex.tcl
    44
    5 include ../../Mk/dports.mk
    65include ../../Mk/dports.autoconf.mk
    76
     
    1312
    1413install:
    15         @mkdir -p ${INSTALLDIR}
    16         @set -x; for file in ${SRCS}; do \
     14        $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} ${INSTALLDIR}
     15        $(SILENT)set -x; for file in ${SRCS}; do \
    1716                $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $$file ${INSTALLDIR}; \
    1817        done
    19         @../pkg_mkindex.tcl ${INSTALLDIR}
     18        $(SILENT)../pkg_mkindex.tcl ${INSTALLDIR}
    2019# XXX Prior installations of dports on Darwin installed darwinports1.0 in a version-specific Tcl path
    21         @if test ${TCL_PACKAGE_DIR} -ef "/System/Library/Tcl" ; then \
     20        $(SILENT)if test ${TCL_PACKAGE_DIR} -ef "/System/Library/Tcl" ; then \
    2221                if test -f ${DARWIN_OLD_PKGINDEX}; then \
    2322                        set -x; \
  • trunk/base/src/pextlib1.0/Makefile

    r2620 r2809  
    33INSTALLDIR= ${DESTDIR}${datadir}/darwinports/Tcl/pextlib1.0
    44
    5 include ../../Mk/dports.mk
    65include ../../Mk/dports.autoconf.mk
    76include ../../Mk/dports.tea.mk
  • trunk/base/src/port/Makefile

    r2777 r2809  
    11MAN1=           port.1
    2 INSTALLDIR=     ${DESTDIR}${PREFIX}
     2INSTALLDIR=     ${DESTDIR}${prefix}
    33
    4 include ../../Mk/dports.mk
    54include ../../Mk/dports.autoconf.mk
    65
    76mkdirs:
    8         cat ../../doc/prefix.mtree | sed -e "s/uname=UNAME/uname=${DSTUSR}/" | \
    9         sed -e "s/gname=GNAME/gname=${DSTGRP}/" | \
    10         mtree -U -d -e -p ${INSTALLDIR} > /dev/null
     7        cat ../../doc/prefix.mtree | mtree -U -d -e -p ${INSTALLDIR} > /dev/null
    118
    129all:
  • trunk/base/src/port1.0/Makefile

    r2775 r2809  
    1111include ../../Mk/dports.subdir.mk
    1212include ../../Mk/dports.autoconf.mk
    13 include ../../Mk/dports.mk
    1413
    1514all::
     
    2019
    2120install::
    22         mkdir -p ${INSTALLDIR}
    23         @set -x; for file in ${SRCS}; do \
     21        $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} ${INSTALLDIR}
     22        $(SILENT)set -x; for file in ${SRCS}; do \
    2423                $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $$file ${INSTALLDIR}; \
    2524        done
    26         ../pkg_mkindex.tcl ${INSTALLDIR}
     25        $(SILENT)../pkg_mkindex.tcl ${INSTALLDIR}
  • trunk/base/src/port1.0/resources/Makefile

    r2775 r2809  
    55include ../../../Mk/dports.subdir.mk
    66include ../../../Mk/dports.autoconf.mk
    7 include ../../../Mk/dports.mk
    87
    98install::
    10         mkdir -p ${INSTALLDIR}
    11         @set -x; for file in ${RSRCS}; do \
     9        $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} ${INSTALLDIR}
     10        $(SILENT)set -x; for file in ${RSRCS}; do \
    1211                $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $$file ${INSTALLDIR}; \
    1312        done
  • trunk/base/src/port1.0/resources/package/Makefile

    r2776 r2809  
    22RSRCS=          background.tiff
    33
    4 include ../../../../Mk/dports.mk
    54include ../../../../Mk/dports.autoconf.mk
    65
     
    1211
    1312install:
    14         mkdir -p ${INSTALLDIR}
    15         @set -x; for file in ${RSRCS}; do \
     13        $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} ${INSTALLDIR}
     14        $(SILENT)set -x; for file in ${RSRCS}; do \
    1615                $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $$file ${INSTALLDIR}; \
    1716        done
  • trunk/base/src/port1.0/resources/sitelists/Makefile

    r2776 r2809  
    1 INSTALLDIR=     ${DESTDIR}${PREFIX}/share/darwinports/resources/port1.0/sitelists
     1INSTALLDIR=     ${DESTDIR}${prefix}/share/darwinports/resources/port1.0/sitelists
    22
    33RSRCS=          master_sites.tcl
    44
    5 include ../../../../Mk/dports.mk
    65include ../../../../Mk/dports.autoconf.mk
    76
     
    1312
    1413install:
    15         mkdir -p ${INSTALLDIR}
    16         @set -x; for file in ${RSRCS}; do \
     14        $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} ${INSTALLDIR}
     15        $(SILENT)set -x; for file in ${RSRCS}; do \
    1716                $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $$file ${INSTALLDIR}; \
    1817        done
Note: See TracChangeset for help on using the changeset viewer.