Changeset 14467


Ignore:
Timestamp:
Oct 8, 2005, 2:20:40 AM (15 years ago)
Author:
jmpp
Message:

Submitted by: jmpp@

Lets assure all our Makefiles respect a temporary ${DESTDIR} installation.
Also some minor cleanups here and there.

Location:
trunk/base
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • trunk/base/Makefile.in

    r13714 r14467  
    1616
    1717install::
    18         $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 dp_version ${portconfigdir}
     18        $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 dp_version ${DESTDIR}${portconfigdir}
    1919        @echo ""
    2020        @echo "Congratulations, you have successfully installed the DarwinPorts system."
  • trunk/base/Mk/dports.autoconf.mk.in

    r13584 r14467  
    1515TCL_CC                  = @TCL_CC@
    1616SHLIB_LD                = @SHLIB_LD@
    17 LDFLAGS_LIBCURL = @LDFLAGS_LIBCURL@
     17LDFLAGS_LIBCURL         = @LDFLAGS_LIBCURL@
    1818LDFLAGS                 = @LDFLAGS@ $(LDFLAGS_LIBCURL)
    1919SHLIB_LDFLAGS           = @LDFLAGS@
  • trunk/base/src/darwinports1.0/Makefile

    r14422 r14467  
    2424        done
    2525
    26         echo "${TCL_PACKAGE_DIR}" > ${prefix}/var/db/dports/.tclpackage
     26        echo "${TCL_PACKAGE_DIR}" > ${DESTDIR}${prefix}/var/db/dports/.tclpackage
    2727
    2828        $(SILENT) $(TCLSH) ../pkg_mkindex.tcl ${INSTALLDIR}
  • trunk/base/src/package1.0/Makefile

    r9814 r14467  
    1515
    1616install::
    17         $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${DESTDIR}${datadir}/darwinports
    18         $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${DESTDIR}${datadir}/darwinports/Tcl
    1917        $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}
    2018        $(SILENT)set -x; for file in ${SRCS}; do \
  • trunk/base/src/port1.0/Makefile

    r13494 r14467  
    2020
    2121install::
    22         $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${DESTDIR}${datadir}/darwinports
    23         $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${DESTDIR}${datadir}/darwinports/Tcl
    2422        $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}
    2523        $(SILENT)set -x; for file in ${SRCS}; do \
  • trunk/base/src/port1.0/resources/Makefile

    r9814 r14467  
    77
    88install::
    9         $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${DESTDIR}${datadir}/darwinports/resources
    109        $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}
    1110#       $(SILENT)set -x; for file in ${RSRCS}; do \
  • trunk/base/src/portindex/Makefile

    r7230 r14467  
    1313
    1414install: all
    15         mkdir -p $(PREFIX)
    16         chown www:www $(PREFIX)
    17         chmod 0775 $(PREFIX)
    18         $(INSTALL) -m 644 register.html $(PREFIX)
    19         mkdir -p $(cgibin)
    20         chown www:www $(cgibin)
    21         chmod 0775 $(cgibin)
    22         $(INSTALL) -m 755 portsubmit.cgi $(cgibin)
    23         $(INSTALL) -m 755 portregister.cgi $(cgibin)
    24         mkdir -p $(portindex)
    25         chown www:www $(portindex)
    26         chmod 0775 $(portindex)
    27         mkdir -p $(portfiles)
    28         chown www:www $(portfiles)
    29         chmod 0775 $(portfiles)
    30         $(INSTALL) -m 644 initialize.sql $(portindex)
     15        mkdir -p ${DESTDIR}$(PREFIX)
     16        chown www:www ${DESTDIR}$(PREFIX)
     17        chmod 0775 ${DESTDIR}$(PREFIX)
     18        $(INSTALL) -m 644 register.html ${DESTDIR}$(PREFIX)
     19        mkdir -p ${DESTDIR}$(cgibin)
     20        chown www:www ${DESTDIR}$(cgibin)
     21        chmod 0775 ${DESTDIR}$(cgibin)
     22        $(INSTALL) -m 755 portsubmit.cgi ${DESTDIR}$(cgibin)
     23        $(INSTALL) -m 755 portregister.cgi ${DESTDIR}$(cgibin)
     24        mkdir -p ${DESTDIR}$(portindex)
     25        chown www:www ${DESTDIR}$(portindex)
     26        chmod 0775 ${DESTDIR}$(portindex)
     27        mkdir -p ${DESTDIR}$(portfiles)
     28        chown www:www ${DESTDIR}$(portfiles)
     29        chmod 0775 ${DESTDIR}$(portfiles)
     30        $(INSTALL) -m 644 initialize.sql ${DESTDIR}$(portindex)
    3131
    3232clean:
  • trunk/base/src/programs/daemondo/Makefile.in

    r13715 r14467  
    1 # $Id: Makefile.in,v 1.5 2005/08/25 13:27:35 pguyot Exp $
     1# $Id: Makefile.in,v 1.6 2005/10/08 02:20:40 jmpp Exp $
    22
    33top_srcdir = @top_srcdir@
     
    2222${PROGRAM}: ${OBJS}
    2323        ${CC} ${CFLAGS} -o ${PROGRAM} ${LIBS} ${OBJS}
    24        
     24
    2525mkdirs:
    2626        mkdir -p build
     
    3333
    3434install:
    35         ${INSTALL} -o ${DSTUSR} -g ${DSTGRP} -m 555 ${PROGRAM} ${bindir}
     35        ${INSTALL} -o ${DSTUSR} -g ${DSTGRP} -m 555 ${PROGRAM} ${DESTDIR}${bindir}
    3636
    3737test:
  • trunk/base/src/programs/mtree/Makefile.in

    r4789 r14467  
    6161
    6262install:
    63         ${INSTALL} ${PROG} ${bindir}
    64         ${INSTALL} -m 755 -d ${mandircat8}
    65         ${INSTALL} -m 444 ${PROG}.cat8 ${mandircat8}/${PROG}.0
     63        ${INSTALL} ${PROG} ${DESTDIR}${bindir}
     64        ${INSTALL} -m 755 -d ${DESTDIR}${mandircat8}
     65        ${INSTALL} -m 444 ${PROG}.cat8 ${DESTDIR}${mandircat8}/${PROG}.0
Note: See TracChangeset for help on using the changeset viewer.