Changeset 17535 for trunk/base


Ignore:
Timestamp:
Apr 17, 2006, 7:01:46 AM (14 years ago)
Author:
jmpp
Message:

Submitted by: jmpp@

Force James' 1.1 --> 1.2 sources location upgrade routine to respect the DESTDIR
variable (I know there are usually no rsync sources in a DESTDIR temporary
installation; but as things currently stand, if such is called for then the
upgrade routine will try to mock with dirs outside the DESTDIR, which shouldn't
happen).

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/base/Makefile.in

    r15506 r17535  
    2727        # Compatibility upgrade from dp 1.1 to dp 1.2
    2828        @echo "Renaming rsync'd directories from rsync.opendarwin.org to rsync.darwinports.org"
    29         if test -d ${localstatedir}/db/dports/sources/rsync.rsync.opendarwin.org_dpupdate_dports \
    30            -a ! -d ${localstatedir}/db/dports/sources/rsync.rsync.darwinports.org_dpupdate_dports; then \
    31                 mv ${localstatedir}/db/dports/sources/rsync.rsync.opendarwin.org_dpupdate_dports \
    32                    ${localstatedir}/db/dports/sources/rsync.rsync.darwinports.org_dpupdate_dports; \
     29        if test -d ${DESTDIR}${localstatedir}/db/dports/sources/rsync.rsync.opendarwin.org_dpupdate_dports \
     30           -a ! -d ${DESTDIR}${localstatedir}/db/dports/sources/rsync.rsync.darwinports.org_dpupdate_dports; then \
     31                mv ${DESTDIR}${localstatedir}/db/dports/sources/rsync.rsync.opendarwin.org_dpupdate_dports \
     32                   ${DESTDIR}${localstatedir}/db/dports/sources/rsync.rsync.darwinports.org_dpupdate_dports; \
    3333        fi
    34         if test -d ${localstatedir}/db/dports/sources/rsync.rsync.opendarwin.org_dpupdate1 \
    35            -a ! -d ${localstatedir}/db/dports/sources/rsync.rsync.darwinports.org_dpupdate1; then \
    36                 mv ${localstatedir}/db/dports/sources/rsync.rsync.opendarwin.org_dpupdate1 \
    37                    ${localstatedir}/db/dports/sources/rsync.rsync.darwinports.org_dpupdate1; \
     34        if test -d ${DESTDIR}${localstatedir}/db/dports/sources/rsync.rsync.opendarwin.org_dpupdate1 \
     35           -a ! -d ${DESTDIR}${localstatedir}/db/dports/sources/rsync.rsync.darwinports.org_dpupdate1; then \
     36                mv ${DESTDIR}${localstatedir}/db/dports/sources/rsync.rsync.opendarwin.org_dpupdate1 \
     37                   ${DESTDIR}${localstatedir}/db/dports/sources/rsync.rsync.darwinports.org_dpupdate1; \
    3838        fi
    3939
Note: See TracChangeset for help on using the changeset viewer.