From 14fbdef91206e1fa14b6fedf1b013cbba1021124 Mon Sep 17 00:00:00 2001
From: bernhardheld <bernhardheld@4a8a32a2-be11-0410-ad9d-d568d2c75423>
Date: Fri, 19 Jan 2007 21:27:19 +0000
Subject: [PATCH] * doc/sdccman.lyx: updated "configure options" for autoconf
 2.6 * support/scripts/sdcc_cygwin_mingw32, * support/scripts/sdcc_mingw32, *
 support/scripts/build.mak: replaced --datadir by --datarootdir for
 conformance with autoconf 2.6

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@4584 4a8a32a2-be11-0410-ad9d-d568d2c75423
---
 ChangeLog                           |  8 ++++
 doc/sdccman.lyx                     | 70 ++++++++++++++++++++++++-----
 support/scripts/build.mak           |  4 +-
 support/scripts/sdcc_cygwin_mingw32 |  4 +-
 support/scripts/sdcc_mingw32        |  4 +-
 5 files changed, 74 insertions(+), 16 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index dd664b98..57680dc4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-01-19 Bernhard Held <bernhard AT bernhardheld.de>
+
+	* doc/sdccman.lyx: updated "configure options" for autoconf 2.6
+	* support/scripts/sdcc_cygwin_mingw32,
+	* support/scripts/sdcc_mingw32,
+	* support/scripts/build.mak: replaced --datadir by --datarootdir for
+	conformance with autoconf 2.6
+
 2007-01-19 Raphael Neider <rneider AT web.de>
 
 	* src/pic/device.c (register_map): fixed list construction
diff --git a/doc/sdccman.lyx b/doc/sdccman.lyx
index 3c2984c9..f410449d 100644
--- a/doc/sdccman.lyx
+++ b/doc/sdccman.lyx
@@ -1059,6 +1059,20 @@ status Collapsed
 \end_inset 
 
 -datadir see table below
+\layout List
+\labelwidthstring 00.00.0000
+
+-
+\begin_inset ERT
+status Collapsed
+
+\layout Standard
+
+\backslash 
+/
+\end_inset 
+
+-datarootdir see table below
 \newline 
 
 \layout List
@@ -1351,7 +1365,7 @@ These defaults are:
 \align center 
 
 \begin_inset  Tabular
-<lyxtabular version="3" rows="8" columns="3">
+<lyxtabular version="3" rows="9" columns="3">
 <features>
 <column alignment="block" valignment="top" leftline="true" width="0in">
 <column alignment="block" valignment="top" leftline="true" width="0in">
@@ -1462,7 +1476,7 @@ BINDIR
 
 
 \emph on 
-$EXECPREFIX
+$EXEC_PREFIX
 \emph default 
 /bin
 \end_inset 
@@ -1474,7 +1488,7 @@ $EXECPREFIX
 
 
 \emph on 
-$EXECPREFIX
+$EXEC_PREFIX
 \emph default 
 
 \backslash 
@@ -1499,6 +1513,38 @@ DATADIR
 \layout Standard
 
 
+\emph on 
+$DATAROOTDIR
+\end_inset 
+</cell>
+<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
+\begin_inset Text
+
+\layout Standard
+
+
+\emph on 
+$DATAROOTDIR
+\end_inset 
+</cell>
+</row>
+<row topline="true">
+<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\layout Standard
+
+
+\emph on 
+DATAROOTDIR
+\end_inset 
+</cell>
+<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\layout Standard
+
+
 \emph on 
 $PREFIX
 \emph default 
@@ -1534,7 +1580,7 @@ DOCDIR
 
 
 \emph on 
-$DATADIR
+$DATAROOTDIR
 \emph default 
 /sdcc/doc
 \end_inset 
@@ -1546,7 +1592,7 @@ $DATADIR
 
 
 \emph on 
-$DATADIR
+$DATAROOTDIR
 \emph default 
 
 \backslash 
@@ -1784,7 +1830,7 @@ status Collapsed
 /
 \end_inset 
 
--datadir=
+-datarootdir=
 \begin_inset Quotes srd
 \end_inset 
 
@@ -1901,7 +1947,7 @@ status Collapsed
 /
 \end_inset 
 
--datadir=
+-datarootdir=
 \begin_inset Quotes srd
 \end_inset 
 
@@ -1917,7 +1963,9 @@ docdir=
 \begin_inset Quotes srd
 \end_inset 
 
-/sdcc/doc
+
+\backslash 
+${datarootdir}/doc
 \begin_inset Quotes srd
 \end_inset 
 
@@ -2058,7 +2106,7 @@ status Collapsed
 /
 \end_inset 
 
--datadir=
+-datarootdir=
 \begin_inset Quotes srd
 \end_inset 
 
@@ -2074,7 +2122,9 @@ docdir=
 \begin_inset Quotes srd
 \end_inset 
 
-/sdcc/doc
+
+\backslash 
+${datarootdir}/doc
 \begin_inset Quotes srd
 \end_inset 
 
diff --git a/support/scripts/build.mak b/support/scripts/build.mak
index 664b82bd..945ac61a 100644
--- a/support/scripts/build.mak
+++ b/support/scripts/build.mak
@@ -126,10 +126,10 @@ ifdef TNP
 	export CCC=$(TNP)c++; \
 	export RANLIB=$(TNP)ranlib; \
 	export CC=$(TNP)gcc; \
-	./configure --datadir=$(SDCC_ROOT)
+	./configure --datarootdir=$(SDCC_ROOT)
 	echo $$CCC
 else
-	cd sdcc; ./configure --datadir=$(SDCC_ROOT)
+	cd sdcc; ./configure --datarootdir=$(SDCC_ROOT)
 endif
 
 dist: _sdcc lcc tidy
diff --git a/support/scripts/sdcc_cygwin_mingw32 b/support/scripts/sdcc_cygwin_mingw32
index 2c9dd210..2588d4f1 100755
--- a/support/scripts/sdcc_cygwin_mingw32
+++ b/support/scripts/sdcc_cygwin_mingw32
@@ -3,8 +3,8 @@
 
 ./configure -C \
 --prefix="/sdcc" \
---datadir="/sdcc" \
-docdir="/sdcc/doc" \
+--datarootdir="/sdcc" \
+docdir="\${datarootdir}/doc" \
 include_dir_suffix="include" \
 lib_dir_suffix="lib" \
 sdccconf_h_dir_separator="\\\\" \
diff --git a/support/scripts/sdcc_mingw32 b/support/scripts/sdcc_mingw32
index 45848380..ac78f548 100755
--- a/support/scripts/sdcc_mingw32
+++ b/support/scripts/sdcc_mingw32
@@ -9,8 +9,8 @@ export STRIP=$TOOLSPREFIX/strip
 
 export SDCCCONFIGUREFLAGS=" \
 --prefix=/sdcc \
---datadir=/sdcc \
-docdir=/sdcc/doc \
+--datarootdir=/sdcc \
+docdir=\${datarootdir}/doc \
 include_dir_suffix=include \
 lib_dir_suffix=lib \
 sdccconf_h_dir_separator=\\\\ \
-- 
2.30.2