Ticket #12309: autoconf.diff

File autoconf.diff, 3.1 KB (added by sfiera@…, 17 years ago)

  • base/configure 

    diff --git a/base/configure b/base/configure
index 3b081e3..b312027 100755
    a b prefix=$oldprefix 
    1168911689
    1169011690
    1169111691# Output
    11692 ac_config_files="$ac_config_files Makefile Mk/macports.autoconf.mk doc/prefix.mtree doc/macosx.mtree doc/macports.conf src/Makefile src/macports1.0/macports_autoconf.tcl src/tclobjc1.0/Makefile src/port1.0/port_autoconf.tcl src/registry1.0/registry_autoconf.tcl src/programs/Makefile src/macports1.0/macports_fastload.tcl"
     11692ac_config_files="$ac_config_files Makefile Mk/macports.autoconf.mk doc/prefix.mtree doc/macosx.mtree doc/macports.conf src/Makefile src/macports1.0/macports_autoconf.tcl src/tclobjc1.0/Makefile src/port1.0/port_autoconf.tcl src/registry1.0/registry_autoconf.tcl src/programs/Makefile src/macports1.0/macports_fastload.tcl src/port/port src/port/portindex src/port/portmirror"
    1169311693
    1169411694
    1169511695cat >confcache <<\_ACEOF
    … … do 
    1225912259    "src/registry1.0/registry_autoconf.tcl") CONFIG_FILES="$CONFIG_FILES src/registry1.0/registry_autoconf.tcl" ;;
    1226012260    "src/programs/Makefile") CONFIG_FILES="$CONFIG_FILES src/programs/Makefile" ;;
    1226112261    "src/macports1.0/macports_fastload.tcl") CONFIG_FILES="$CONFIG_FILES src/macports1.0/macports_fastload.tcl" ;;
     12262    "src/port/port") CONFIG_FILES="$CONFIG_FILES src/port/port" ;;
     12263    "src/port/portindex") CONFIG_FILES="$CONFIG_FILES src/port/portindex" ;;
     12264    "src/port/portmirror") CONFIG_FILES="$CONFIG_FILES src/port/portmirror" ;;
    1226212265
    1226312266  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
    1226412267echo "$as_me: error: invalid argument: $ac_config_target" >&2;}

  • base/configure.ac 

    diff --git a/base/configure.ac b/base/configure.ac
index 4249844..b388f2f 100644
    a b AC_CONFIG_FILES([ 
    281281        src/registry1.0/registry_autoconf.tcl
    282282        src/programs/Makefile
    283283        src/macports1.0/macports_fastload.tcl
     284    src/port/port
     285    src/port/portindex
     286    src/port/portmirror
    284287])
    285288
    286289AC_OUTPUT

  • base/src/port/Makefile 

    diff --git a/base/src/port/Makefile b/base/src/port/Makefile
index 228f585..2638fab 100644
    a b INSTALLDIR= ${DESTDIR}${prefix} 
    22TOPSRCDIR=      ../..
    33SCRIPTS=        portmirror portindex port
    44
    5 edit = sed \
    6         -e 's,@TCLSH\@,$(TCLSH),g' \
    7         -e 's,@TCL_PACKAGE_DIR\@,$(TCL_PACKAGE_DIR),g'
    8 
    95include ../../Mk/macports.autoconf.mk
    106
    117all: ${SCRIPTS}
    128
    13 portmirror: portmirror.tcl
    14         ${edit} portmirror.tcl > $@
    15 
    16 portindex: portindex.tcl
    17         ${edit} portindex.tcl > $@
    18 
    19 port: port.tcl
    20         ${edit} port.tcl > $@
    21 
    229mkdirs:
    2310        cat ../../doc/prefix.mtree | $(MTREE) -U -d -e -p ${INSTALLDIR} > /dev/null
    2411