In metaconfig.git, the branch master has been updated

<http://perl5.git.perl.org/metaconfig.git/commitdiff/2fe2122407a06f4cfc0095cac9c1281034079f7c?hp=c33b44743d1aa73d0bf018b2b8f3fba666a8cf75>

- Log -----------------------------------------------------------------
commit 2fe2122407a06f4cfc0095cac9c1281034079f7c
Author: H.Merijn Brand - Tux <h.m.br...@xs4all.nl>
Date:   Sat Apr 23 12:50:46 2016 +0200

    Update README for FS type and mconfig

M       README

commit 1a9ceace868199b322af3edb904262366cbf130c
Author: H.Merijn Brand - Tux <h.m.br...@xs4all.nl>
Date:   Sat Apr 23 12:32:05 2016 +0200

    removed but saved old dist folder

M       .gitignore
-----------------------------------------------------------------------

Summary of changes:
 .gitignore      |  1 +
 README          | 33 +++++++++++++++++----------------
 U/ebcdic/trnl.U | 51 ---------------------------------------------------
 dist/U/trnl.U   |  3 ---
 4 files changed, 18 insertions(+), 70 deletions(-)
 delete mode 100644 U/ebcdic/trnl.U

diff --git a/.gitignore b/.gitignore
index 007397e..bcd9647 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ U/all
 dist-git
 dist-svn
 dist-3.5-20
+dist-3.5-20.txz
diff --git a/README b/README
index 881f1a9..5ea28c4 100644
--- a/README
+++ b/README
@@ -3,7 +3,12 @@
 The Configure script and config_h.SH file in the Perl distribution are
 generated by a program called metaconfig.  Metaconfig was originally 
 written by Larry Wall, and was subsequently enhanced and maintained
-by Raphael Manfredi.
+by Raphael Manfredi. The binary that invokes the generation of the
+Configure file is called mconfig.
+
+As sort order and filenaming are vital in this process, make sure you
+are working on a case-sensitive file system! (Case preserving is not
+sufficient).
 
 You have presumably obtained the metaconfig from the repository e.g.
 
@@ -22,14 +27,6 @@ Contents of this directory:
     U:         Metaconfig units used for building Perl's Configure
     U.check:   Sample directory used for testing new metaconfig units.
                see U.check/README for more information.
-    dist-3.5-20:
-               dist-3.5-20 is almost meta-4.0, still maintained by Raphael
-               Manfredi, but with a lot of fixes over 3.0, some changes
-               from the perl modifications merged and a much better
-               metalint. This directory comes from a tar distribution.
-    dist-svn:
-               a git clone of "dist". Optionally present. See (a) below.
-               This is where dist/meta resided before 2016-04-01
     dist-git:
                a git clone of "dist". Optionally present. See (a) below.
                This is where dist/meta resides as of 2016-04-01
@@ -69,13 +66,13 @@ Contents of this directory:
     We have not yet arranged for metaconfig to use perl's versions of the
     'units' by default so you need some housekeeping in the perl directory...
 
-(aa)  -- optional --
+(aa)
 
-    If you plan to make changes to metaconfig or metalint locally (and you
-    probably want to, as both are written for perl4), consider installing
-    mconfig and mlint from the cmon subdirectory into your $PATH too. These
-    are the non-autoloading versions and can easily be changed. Here is what
-    I added at the beginning of mconfig:
+    If you plan to make changes to mconfig or mlint locally (and you probably
+    want to, as both are written for perl4), consider installing mconfig and
+    mlint from the cmon subdirectory into your $PATH too. These are the
+    non-autoloading versions and can easily be changed. Here is what I added
+    at the beginning of mconfig:
 
     --8<---
     BEGIN { $ENV{LC_ALL} = "C"; }
@@ -129,7 +126,11 @@ Contents of this directory:
 
 (e) chmod +w Configure config_h.SH
 
-(f) metaconfig -m to regenerate Configure (or mconfig -m)
+(f) mconfig -m -O to regenerate Configure and config_h.SH
+
+    Make *sure* your mconfig is the correct one in your $PATH, as the mono-web
+    package will install /usr/bin/mconfig which will do something completely
+    different.
 
 (g) metaconfig does not deal with depends in config_h.SH, so some
     reorganization is needed.
diff --git a/U/ebcdic/trnl.U b/U/ebcdic/trnl.U
deleted file mode 100644
index cf91acd..0000000
--- a/U/ebcdic/trnl.U
+++ /dev/null
@@ -1,51 +0,0 @@
-?RCS: $Id: trnl.U,v 3.0.1.3 1994/05/06 15:11:49 doughera Exp $
-?RCS:
-?RCS: Copyright (c) 1998 Andy Dougherty
-?RCS:
-?RCS: You may distribute under the terms of either the GNU General Public
-?RCS: License or the Artistic License, as specified in the README file.
-?RCS:
-?RCS:  Original author Jarkko Hietaniemi <j...@iki.fi>
-?RCS:  Merged into dist by Andy Dougherty  July 13, 1998
-?RCS:
-?MAKE:trnl:
-?MAKE: -pick add $@ %<
-?S:trnl:
-?S:    This variable contains the value to be passed to the tr(1)
-?S:    command to transliterate a newline.  Typical values are
-?S:    '\012' and '\n'.  This is needed for EBCDIC systems where
-?S:    newline is not necessarily '\012'.
-?S:.
-?T: DJGPP
-: Find the appropriate value for a newline for tr
-echo " "
-?X: dos djgpp uses '\015\012', but reportedly is happy with '\012' in the
-?X: tr command.  I don't know why it passes the '\n' test but later
-?X: refuses to work correctly with it.  --AD  6/14/98
-if test -n "$DJGPP"; then
-       trnl='\012'
-fi
-if test X"$trnl" = X; then
-       case "`echo foo|tr '\n' x 2>/dev/null`" in
-       foox) trnl='\n' ;;
-       esac
-fi
-if test X"$trnl" = X; then
-       case "`echo foo|tr '\012' x 2>/dev/null`" in
-       foox) trnl='\012' ;;
-       esac
-fi
-if test X"$trnl" = X; then
-       case "`echo foo|tr '\r\n' xy 2>/dev/null`" in
-       fooxy) trnl='\n\r' ;;
-       esac
-fi
-if test X"$trnl" = X; then
-       cat <<EOM >&2
-
-$me: Fatal Error: cannot figure out how to translate newlines with 'tr'.
-
-EOM
-       exit 1
-fi
-
diff --git a/dist/U/trnl.U b/dist/U/trnl.U
index 77bcded..df5fa8a 100644
--- a/dist/U/trnl.U
+++ b/dist/U/trnl.U
@@ -23,7 +23,6 @@
 ?S:.
 ?T: DJGPP
 : Find the appropriate value for a newline for tr
-echo " "
 ?X: We can't use $tr since that would cause a circular dependency via Myread
 ?X: dos djgpp uses '\015\012', but reportedly is happy with '\012' in the
 ?X: tr command.  I don't know why it passes the '\n' test but later
@@ -53,7 +52,5 @@ $me: Fatal Error: cannot figure out how to translate newlines 
with 'tr'.
 
 EOM
        exit 1
-else
-       echo "We'll use '$trnl' to transliterate a newline."
 fi
 

--
perl5 metaconfig repository

Reply via email to