Changeset 11922


Ignore:
Timestamp:
Apr 20, 2005, 9:35:49 PM (15 years ago)
Author:
ssen
Message:

Remove compatibility logic to put sources.conf in /etc/ports for
the "default" configure. Now we always use $prefix/etc/ports, or more
precisely $sysconfdir/ports. $sysconfdir can be overridden on
the commandline independent of $prefix, but defaults to $prefix/etc
Suggested by: jmpp@

Location:
trunk/base
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/base/aclocal.m4

    r11844 r11922  
    4040
    4141
    42 # OD_PATH_PORTCONFIGDIR(PREFIX)
     42# OD_PATH_PORTCONFIGDIR
    4343#---------------------------------------
    4444AC_DEFUN([OD_PATH_PORTCONFIGDIR],[
     
    4949        AC_MSG_CHECKING([for ports config directory])
    5050
    51         if test "$1" != "NONE" ; then
    52                 dnl user gave --prefix
    53                 portconfigdir='${sysconfdir}/ports'
    54         else
    55            case $host_os in
    56            darwin*)
    57                 portconfigdir='/private/etc/ports'
    58                 ;;
    59            *)
    60                 portconfigdir='/etc/ports'
    61                 ;;
    62            esac
    63         fi
    64 
     51        portconfigdir='${sysconfdir}/ports'
    6552
    6653        AC_MSG_RESULT([$portconfigdir])
  • trunk/base/configure.ac

    r11844 r11922  
    3838AC_PREFIX_DEFAULT(/opt/local)
    3939OD_PATH_DPORTSDIR([$DPORTS_DIR_DEFAULT])
    40 OD_PATH_PORTCONFIGDIR([$prefix])
     40OD_PATH_PORTCONFIGDIR
    4141
    4242# Check for install ownership
Note: See TracChangeset for help on using the changeset viewer.