From 086e9ed2daaca207f4dc21a457c5e77c02c8a093 Mon Sep 17 00:00:00 2001
From: Robin Haberkorn <robin.haberkorn@googlemail.com>
Date: Wed, 20 Mar 2013 15:00:22 +0100
Subject: default Scintilla-path is ../scintilla

so no additional --with-scintilla is necessary when building from
a source bundle
---
 configure.ac | 4 ++--
 debian/rules | 1 -
 distribute   | 5 +++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index 2e56b74..90dde43 100644
--- a/configure.ac
+++ b/configure.ac
@@ -95,8 +95,8 @@ esac
 #
 AC_ARG_WITH(scintilla,
 	AS_HELP_STRING([--with-scintilla=PATH],
-		       [Specify Scintilla's path [default=..]]),
-	[SCINTILLA_PATH=$withval], [SCINTILLA_PATH=..])
+		       [Specify Scintilla's path [default=../scintilla]]),
+	[SCINTILLA_PATH=$withval], [SCINTILLA_PATH=../scintilla])
 # eval necessary to perform necessary expansions that may not
 # have been done by the calling shell
 SCINTILLA_PATH=`eval $READLINK -e $SCINTILLA_PATH`
diff --git a/debian/rules b/debian/rules
index 7b7396b..6c6a679 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,6 @@ build:
 	dh_auto_build -Dscintilla/scinterm
 	dh_auto_configure -Dsciteco -- \
 			  --enable-bootstrap \
-			  --with-scintilla=../scintilla \
 			  --with-interface=ncurses
 	dh_auto_build -Dsciteco
 	touch $@
diff --git a/distribute b/distribute
index c310d27..fe2c6a5 100755
--- a/distribute
+++ b/distribute
@@ -70,8 +70,9 @@ sciteco-$(SCITECO_VERSION)-win32.zip : bundle
 		CXX=i686-w64-mingw32-g++ AR=i686-w64-mingw32-ar
 	(cd sciteco-$(SCITECO_VERSION)/sciteco; \
 	 ./configure --host=i686-w64-mingw32 --prefix=/ \
-		     --with-scintilla=../scintilla --with-interface=pdcurses \
-		     --with-default-scitecopath=lib --disable-bootstrap \
+		     --with-interface=pdcurses \
+		     --with-default-scitecopath=lib \
+		     --disable-bootstrap \
 		     --enable-html-manual \
 		     CFLAGS="-g -O3" CXXFLAGS="-g -O3"; \
 	)
-- 
cgit v1.2.3