[Dotgnu-pnet-commits] CVS: pnet ChangeLog,1.2107,1.2108 config-ml.in,1.1,1.2 configure.in,1.106,1.107

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnet
In directory subversions:/tmp/cvs-serv20127

Modified Files:
        ChangeLog config-ml.in configure.in 
Log Message:


Fix "make clean" within the "libffi" directory.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/ChangeLog,v
retrieving revision 1.2107
retrieving revision 1.2108
diff -C2 -r1.2107 -r1.2108
*** ChangeLog   6 Feb 2003 23:24:49 -0000       1.2107
--- ChangeLog   7 Feb 2003 00:01:42 -0000       1.2108
***************
*** 5,8 ****
--- 5,11 ----
        from the gcc CVS tree.
  
+       * config-ml.in, configure.in, libffi/Makefile.in: fix "make clean"
+       within the "libffi" directory.
+ 
  2003-02-06  Rhys Weatherley  <address@hidden>
  

Index: config-ml.in
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/config-ml.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** config-ml.in        10 May 2002 23:08:07 -0000      1.1
--- config-ml.in        7 Feb 2003 00:01:43 -0000       1.2
***************
*** 65,73 ****
  # libraries as desired.
  
- # We have to handle being invoked by both Cygnus configure and Autoconf.
- #
- # Cygnus configure incoming variables:
- # srcdir, subdir, host, arguments
- #
  # Autoconf incoming variables:
  # srcdir, host, ac_configure_args
--- 65,68 ----
***************
*** 79,97 ****
  # configured for a particular host.
  
! if [ -n "${ac_configure_args}" ]; then
!   Makefile=${ac_file-Makefile}
!   ml_config_shell=${CONFIG_SHELL-/bin/sh}
!   ml_arguments="${ac_configure_args}"
!   ml_realsrcdir=${srcdir}
! else
!   Makefile=${Makefile-Makefile}
!   ml_config_shell=${config_shell-/bin/sh}
!   ml_arguments="${arguments}"
!   if [ -n "${subdir}" -a "${subdir}" != "." ] ; then
!     ml_realsrcdir=${srcdir}/${subdir}
!   else
!     ml_realsrcdir=${srcdir}
!   fi
! fi
  
  # Scan all the arguments and set all the ones we need.
--- 74,81 ----
  # configured for a particular host.
  
! Makefile=${ac_file-Makefile}
! ml_config_shell=${CONFIG_SHELL-/bin/sh}
! ml_arguments="${ac_configure_args}"
! ml_realsrcdir=${srcdir}
  
  # Scan all the arguments and set all the ones we need.
***************
*** 528,531 ****
--- 512,517 ----
  cat > Multi.tem <<\EOF
  
+ PWD=$${PWDCMD-pwd}
+ 
  # FIXME: There should be an @-sign in front of the `if'.
  # Leave out until this is tested a bit more.
***************
*** 534,539 ****
          true; \
        else \
!         rootpre=`pwd`/; export rootpre; \
!         srcrootpre=`cd $(srcdir); pwd`/; export srcrootpre; \
          lib=`echo $${rootpre} | sed -e 's,^.*/\([^/][^/]*\)/$$,\1,'`; \
          compiler="$(CC)"; \
--- 520,525 ----
          true; \
        else \
!         rootpre=`${PWD}`/; export rootpre; \
!         srcrootpre=`cd $(srcdir); ${PWD}`/; export srcrootpre; \
          lib=`echo $${rootpre} | sed -e 's,^.*/\([^/][^/]*\)/$$,\1,'`; \
          compiler="$(CC)"; \
***************
*** 554,557 ****
--- 540,544 ----
                                LIBCXXFLAGS="$(LIBCXXFLAGS) $${flags}" \
                                LDFLAGS="$(LDFLAGS) $${flags}" \
+                               DESTDIR="$(DESTDIR)" \
                                $(DO)); then \
                  true; \
***************
*** 571,575 ****
          true; \
        else \
!         lib=`pwd | sed -e 's,^.*/\([^/][^/]*\)$$,\1,'`; \
          for dir in Makefile $(MULTIDIRS); do \
            if [ -f ../$${dir}/$${lib}/Makefile ]; then \
--- 558,562 ----
          true; \
        else \
!         lib=`${PWD} | sed -e 's,^.*/\([^/][^/]*\)$$,\1,'`; \
          for dir in Makefile $(MULTIDIRS); do \
            if [ -f ../$${dir}/$${lib}/Makefile ]; then \
***************
*** 678,685 ****
    if [ "${ml_verbose}" = --verbose ]; then
      echo "Running configure in multilib subdirs ${multidirs}"
!     echo "pwd: `pwd`"
    fi
  
!   ml_origdir=`pwd`
    ml_libdir=`echo $ml_origdir | sed -e 's,^.*/,,'`
    # cd to top-level-build-dir/${with_target_subdir}
--- 665,672 ----
    if [ "${ml_verbose}" = --verbose ]; then
      echo "Running configure in multilib subdirs ${multidirs}"
!     echo "pwd: `${PWDCMD-pwd}`"
    fi
  
!   ml_origdir=`${PWDCMD-pwd}`
    ml_libdir=`echo $ml_origdir | sed -e 's,^.*/,,'`
    # cd to top-level-build-dir/${with_target_subdir}
***************
*** 690,694 ****
      if [ "${ml_verbose}" = --verbose ]; then
        echo "Running configure in multilib subdir ${ml_dir}"
!       echo "pwd: `pwd`"
      fi
  
--- 677,681 ----
      if [ "${ml_verbose}" = --verbose ]; then
        echo "Running configure in multilib subdir ${ml_dir}"
!       echo "pwd: `${PWDCMD-pwd}`"
      fi
  
***************
*** 718,722 ****
      case ${srcdir} in
      ".")
!       echo Building symlink tree in `pwd`/${ml_dir}/${ml_libdir}
        if [ "${with_target_subdir}" != "." ]; then
        ml_unsubdir="../"
--- 705,709 ----
      case ${srcdir} in
      ".")
!       echo Building symlink tree in `${PWDCMD-pwd}`/${ml_dir}/${ml_libdir}
        if [ "${with_target_subdir}" != "." ]; then
        ml_unsubdir="../"
***************
*** 757,761 ****
  
      # FIXME: POPDIR=${PWD=`pwd`} doesn't work here.
!     ML_POPDIR=`pwd`
      cd ${ml_dir}/${ml_libdir}
  
--- 744,748 ----
  
      # FIXME: POPDIR=${PWD=`pwd`} doesn't work here.
!     ML_POPDIR=`${PWDCMD-pwd}`
      cd ${ml_dir}/${ml_libdir}
  

Index: configure.in
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/configure.in,v
retrieving revision 1.106
retrieving revision 1.107
diff -C2 -r1.106 -r1.107
*** configure.in        5 Feb 2003 09:51:31 -0000       1.106
--- configure.in        7 Feb 2003 00:01:43 -0000       1.107
***************
*** 406,410 ****
                fi
                cd "libffi"
!               ${ffisrcdir}/configure --disable-multilib --disable-shared \
                        --host="${host}" --build="${build}" 
--target="${target}" \
                        --disable-fast-install --prefix="${prefix}" \
--- 406,410 ----
                fi
                cd "libffi"
!               ${ffisrcdir}/configure --disable-shared \
                        --host="${host}" --build="${build}" 
--target="${target}" \
                        --disable-fast-install --prefix="${prefix}" \