From 00caa86200a63e411e2ac3ac968faa5dc1dd9506 Mon Sep 17 00:00:00 2001
From: borutr <borutr@4a8a32a2-be11-0410-ad9d-d568d2c75423>
Date: Mon, 31 Mar 2008 21:40:28 +0000
Subject: [PATCH] * configure.in, configure, Makefile.in, Makefile.bcc:  
 adapted for moved cpp2

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@5134 4a8a32a2-be11-0410-ad9d-d568d2c75423
---
 ChangeLog    | 2 ++
 Makefile.bcc | 6 +++---
 Makefile.in  | 2 +-
 configure    | 4 ++--
 configure.in | 2 +-
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8e761d27..4d1b44bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,8 @@
 	  support/cpp2/libcpp/lex.c, support/cpp2/libcpp/system.h,
 	  support/cpp2/libcpp/charset.c: SDCPP synchronized with GCC CPP
 	  release version 4.3.0
+	* configure.in, configure, Makefile.in, Makefile.bcc:
+	  adapted for moved cpp2
 
 2008-03-31 Frieder Ferlemann <Frieder.Ferlemann AT web.de>
 
diff --git a/Makefile.bcc b/Makefile.bcc
index a6ef9cbd..366958af 100644
--- a/Makefile.bcc
+++ b/Makefile.bcc
@@ -1,6 +1,6 @@
 # Makefile for Borlad C++
 
-all: config asx8051 as-z80 sdcc packihx cpp2
+all: config asx8051 as-z80 sdcc packihx cpp
 
 
 config: sdcc_vc.h
@@ -18,8 +18,8 @@ as-z80:
         make -f Makefile.bcc
         cd ..\..
 
-cpp2:
-        cd support\cpp2
+cpp:
+        cd support\cpp
         make -f Makefile.bcc
         cd ..\..
 
diff --git a/Makefile.in b/Makefile.in
index 6610643c..0cf60ef7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -56,7 +56,7 @@ endif
 PKGS            += $(SDCC_DOC)
 
 ifeq ($(OPT_DISABLE_SDCPP), 0)
-SDCC_LIBS       += support/cpp2
+SDCC_LIBS       += support/cpp
 endif
 
 TARGETS         += sdcc-libs sdcc-cc sdcc-device-inc sdcc-aslink sdcc-librarian
diff --git a/configure b/configure
index 32922998..3ca266fe 100755
--- a/configure
+++ b/configure
@@ -719,7 +719,7 @@ sdccconf_h_dir_separator
 include_dir_suffix
 lib_dir_suffix
 docdir'
-ac_subdirs_all='support/cpp2
+ac_subdirs_all='support/cpp
 support/packihx
 sim/ucsim
 debugger/mcs51
@@ -7598,7 +7598,7 @@ mv ports ports.build
 
 # Generating output files
 # ===========================================================================
-test $OPT_DISABLE_SDCPP   = 0 && subdirs="$subdirs support/cpp2"
+test $OPT_DISABLE_SDCPP   = 0 && subdirs="$subdirs support/cpp"
 
 test $OPT_DISABLE_PACKIHX = 0 && subdirs="$subdirs support/packihx"
 
diff --git a/configure.in b/configure.in
index 735fafb1..fb1485f5 100644
--- a/configure.in
+++ b/configure.in
@@ -700,7 +700,7 @@ mv ports ports.build
 
 # Generating output files
 # ===========================================================================
-test $OPT_DISABLE_SDCPP   = 0 && AC_CONFIG_SUBDIRS(support/cpp2)
+test $OPT_DISABLE_SDCPP   = 0 && AC_CONFIG_SUBDIRS(support/cpp)
 test $OPT_DISABLE_PACKIHX = 0 && AC_CONFIG_SUBDIRS(support/packihx)
 test $OPT_DISABLE_UCSIM   = 0 && AC_CONFIG_SUBDIRS(sim/ucsim)
 test $OPT_DISABLE_SDCDB   = 0 && AC_CONFIG_SUBDIRS(debugger/mcs51)
-- 
2.30.2