From: Nigel Metheringham <nigel@exim.org>
Date: Thu, 2 Jul 2009 11:38:56 +0000 (+0000)
Subject: Removed code that symlinks to pcre as its no longer useful. fixes: bug #854
X-Git-Tag: exim-4_70_RC3~63
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=e2aacdfd3b9aeb63d77f2ac8694c4e255ac0930c;p=exim.git

Removed code that symlinks to pcre as its no longer useful. fixes: bug #854
---

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index a3c09f801..cb18becc6 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.563 2009/06/11 14:07:57 tom Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.564 2009/07/02 11:38:56 nm4 Exp $
 
 Change log file for Exim from version 4.21
 -------------------------------------------
@@ -96,6 +96,9 @@ NM/14 Bugzilla 614: Added timeout setting to transport filter.
 
 TK/05 Add native DKIM support (does not depend on external libraries).
 
+NM/14 Bugzilla 854: Removed code that symlinks to pcre as its no longer useful.
+      Patch provided by Graeme Fowler
+
 
 Exim version 4.69
 -----------------
diff --git a/src/scripts/MakeLinks b/src/scripts/MakeLinks
index 15c648c44..9f0956e2c 100755
--- a/src/scripts/MakeLinks
+++ b/src/scripts/MakeLinks
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Cambridge: exim/src/scripts/MakeLinks,v 1.15 2009/06/10 07:34:04 tom Exp $
+# $Cambridge: exim/src/scripts/MakeLinks,v 1.16 2009/07/02 11:38:57 nm4 Exp $
 
 # Script to build links for all the exim source files from the system-
 # specific build directory. It should be run from within that directory.
@@ -25,32 +25,7 @@ echo ""
 echo ">>> Creating links to source files..."
 
 
-# The PCRE regular expression library sources have to be linked
-# independently in their own sub-directory, since their .o files
-# are built using their own Makefile in the sub-directory.
-mkdir pcre
-cd pcre
-ln -s ../../src/pcre/Makefile            Makefile
-ln -s ../../src/pcre/config.h            config.h
-ln -s ../../src/pcre/pcre_internal.h     pcre_internal.h
-ln -s ../../src/pcre/pcre.h              pcre.h
-ln -s ../../src/pcre/pcre_maketables.c   pcre_maketables.c
-ln -s ../../src/pcre/pcre_chartables.c   pcre_chartables.c
-ln -s ../../src/pcre/pcre_config.c       pcre_config.c
-ln -s ../../src/pcre/pcre_get.c          pcre_get.c
-ln -s ../../src/pcre/pcre_globals.c      pcre_globals.c
-ln -s ../../src/pcre/pcre_newline.c      pcre_newline.c
-ln -s ../../src/pcre/pcre_compile.c      pcre_compile.c
-ln -s ../../src/pcre/pcre_exec.c         pcre_exec.c
-ln -s ../../src/pcre/pcre_fullinfo.c     pcre_fullinfo.c
-ln -s ../../src/pcre/pcretest.c          pcretest.c
-ln -s ../../src/pcre/pcre_printint.src   pcre_printint.src
-ln -s ../../src/pcre/pcre_study.c        pcre_study.c
-ln -s ../../src/pcre/pcre_tables.c       pcre_tables.c
-ln -s ../../src/pcre/pcre_try_flipped.c  pcre_try_flipped.c
-ln -s ../../src/pcre/pcre_version.c      pcre_version.c
-ln -s ../../src/pcre/ucp.h               ucp.h
-cd ..
+# PCRE is no longer part of the source distribution, so is no longer linked
 
 # Likewise for the lookups
 mkdir lookups