changed configuration to install header files in $(includedir)/tesseract

git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@18 d0cd1f9f-072b-0410-8dd7-cf729c803f20
LittleDW · Mar 31, 2007 · 7fa6766 · 7fa6766
1 parent 304cfb0
commit 7fa6766
Show file tree

Hide file tree

Showing 15 changed files with 19 additions and 13 deletions.
diff --git a/INSTALL.SVN b/INSTALL.SVN
@@ -0,0 +1,2 @@
+If you have checked out Tesseract from Subversion, you must generate the configure script.
+You can do this by running ./runautoconf and it will go through all the steps.
diff --git a/ccmain/Makefile.am b/ccmain/Makefile.am
@@ -7,7 +7,7 @@ AM_CPPFLAGS = \
     -I$(top_srcdir)/wordrec -I$(top_srcdir)/cutil \
     -I$(top_srcdir)/textord
 
-EXTRA_DIST = \
+include_HEADERS = \
     adaptions.h applybox.h baseapi.h blobcmp.h \
     callnet.h charcut.h \
     control.h docqual.h expandblob.h fixspace.h fixxht.h \

diff --git a/ccstruct/Makefile.am b/ccstruct/Makefile.am
@@ -3,7 +3,7 @@ AM_CPPFLAGS = \
     -I$(top_srcdir)/ccutil -I$(top_srcdir)/cutil \
     -I$(top_srcdir)/image -I$(top_srcdir)/viewer
 
-EXTRA_DIST = \
+include_HEADERS = \
     blckerr.h blobbox.h blobs.h blread.h coutln.h crakedge.h \
     genblob.h hpddef.h hpdsizes.h ipoints.h labls.h linlsq.h \
     lmedsq.h mod128.h normalis.h ocrblock.h ocrrow.h pageblk.h \

diff --git a/ccutil/Makefile.am b/ccutil/Makefile.am
@@ -1,7 +1,7 @@
 SUBDIRS =
 CXXFLAGS = -DTESSDATA_PREFIX=@datadir@/
 
-EXTRA_DIST = \
+include_HEADERS = \
     basedir.h bits16.h clst.h debugwin.h elst2.h elst.h errcode.h \
     fileerr.h getopt.h globaloc.h hashfn.h host.h hosthplb.h lsterr.h \
     mainblk.h memblk.h memryerr.h memry.h mfcpch.h ndminx.h notdll.h \

diff --git a/ccutil/mainblk.cpp b/ccutil/mainblk.cpp
@@ -65,6 +65,7 @@ void main_setup(                         /*main demo program */
 
   imagebasename = basename;      /*name of image */
 
+  if(!getenv("TESSDATA_PREFIX")) {
   #ifdef TESSDATA_PREFIX
   #define _STR(a) #a
   #define _XSTR(a) _STR(a)
@@ -79,6 +80,9 @@ void main_setup(                         /*main demo program */
   NO_PATH.error ("main", DBG, NULL);
   #endif
   #endif
+  } else {
+    datadir = getenv("TESSDATA_PREFIX");
+  }
 
   for (arg = 0; arg < argc; arg++) {
     if (argv[arg][0] == '+' || argv[arg][0] == '-') {

diff --git a/classify/Makefile.am b/classify/Makefile.am
@@ -4,7 +4,7 @@ AM_CPPFLAGS = \
     -I$(top_srcdir)/ccstruct -I$(top_srcdir)/dict \
     -I$(top_srcdir)/viewer
 
-EXTRA_DIST = \
+include_HEADERS = \
     adaptive.h adaptmatch.h baseline.h blobclass.h chartoname.h \
     cluster.h clusttool.h cutoffs.h extern.h extract.h featdefs.h \
     flexfx.h float2int.h fpoint.h fxdefs.h fxid.h hideedge.h \

diff --git a/configure.ac b/configure.ac
@@ -31,7 +31,7 @@ AC_SUBST(PACKAGE_VERSION)
 AC_SUBST(PACKAGE_YEAR)
 AC_SUBST(PACKAGE_DATE)
 
-# datadir="${datadir}/tessdata"
+includedir="${includedir}/tesseract"
 
 AC_ARG_WITH(extra-includes,
             AC_HELP_STRING([--with-extra-includes=DIR],

diff --git a/cutil/Makefile.am b/cutil/Makefile.am
@@ -1,7 +1,7 @@
 SUBDIRS =
 AM_CPPFLAGS = -I$(top_srcdir)/ccutil
 
-EXTRA_DIST = \
+include_HEADERS = \
     bitvec.h callcpp.h const.h cutil.h danerror.h debug.h efio.h \
     emalloc.h freelist.h funcdefs.h general.h globals.h listio.h \
     minmax.h oldheap.h oldlist.h structures.h tessarray.h \

diff --git a/dict/Makefile.am b/dict/Makefile.am
@@ -1,7 +1,7 @@
 SUBDIRS =
 AM_CPPFLAGS = -I$(top_srcdir)/cutil -I$(top_srcdir)/ccutil
 
-EXTRA_DIST = \
+include_HEADERS = \
     choicearr.h choices.h context.h dawg.h hyphen.h matchdefs.h \
     permdawg.h permnum.h permute.h states.h stopper.h trie.h
 

diff --git a/display/Makefile.am b/display/Makefile.am
@@ -4,7 +4,7 @@ AM_CPPFLAGS = \
     -I$(top_srcdir)/viewer -I$(top_srcdir)/textord \
     -I$(top_srcdir)/ccutil
 
-EXTRA_DIST = \
+include_HEADERS = \
     cmndwin.h pagewalk.h pgedit.h pgeditx.h sbdmenu.h submen.h \
     tessio.h varabled.h varblmen.h varblwin.h
 

diff --git a/image/Makefile.am b/image/Makefile.am
@@ -1,7 +1,7 @@
 SUBDIRS =
 AM_CPPFLAGS = -I$(top_srcdir)/ccutil
 
-EXTRA_DIST = \
+include_HEADERS = \
     bitstrm.h imgbmp.h imgerrs.h img.h imgio.h imgs.h \
     imgtiff.h imgunpk.h
 

diff --git a/textord/Makefile.am b/textord/Makefile.am
@@ -3,7 +3,7 @@ AM_CPPFLAGS = \
     -I$(top_srcdir)/ccstruct -I$(top_srcdir)/ccutil \
     -I$(top_srcdir)/image -I$(top_srcdir)/viewer
 
-EXTRA_DIST = \
+include_HEADERS = \
     blkocc.h blobcmpl.h drawedg.h drawtord.h edgblob.h \
     edgloop.h fpchop.h gap_map.h makerow.h oldbasel.h \
     pithsync.h pitsync1.h scanedg.h sortflts.h tessout.h \

diff --git a/training/Makefile.am b/training/Makefile.am
@@ -7,7 +7,7 @@ AM_CPPFLAGS = \
     -I$(top_srcdir)/wordrec -I$(top_srcdir)/cutil \
     -I$(top_srcdir)/textord
 
-EXTRA_DIST = \
+include_HEADERS = \
     cnTraining.dsp mfTraining.dsp \
     mergenf.h name2char.h training.h
 

diff --git a/viewer/Makefile.am b/viewer/Makefile.am
@@ -1,7 +1,7 @@
 SUBDIRS =
 AM_CPPFLAGS = -I$(top_srcdir)/image -I$(top_srcdir)/ccutil
 
-EXTRA_DIST = \
+include_HEADERS = \
     evntlst.h evnts.h grphics.h grphshm.h sbgconst.h sbgdefs.h \
     sbgtypes.h showim.h
 

diff --git a/wordrec/Makefile.am b/wordrec/Makefile.am
@@ -5,7 +5,7 @@ AM_CPPFLAGS = \
     -I$(top_srcdir)/image -I$(top_srcdir)/dict \
     -I$(top_srcdir)/viewer
 
-EXTRA_DIST = \
+include_HEADERS = \
     associate.h badwords.h bestfirst.h charsample.h chop.h \
     chopper.h closed.h djmenus.h drawfx.h findseam.h gradechop.h \
     heuristic.h makechop.h matchtab.h matrix.h measure.h metrics.h \
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		If you have checked out Tesseract from Subversion, you must generate the configure script.
		You can do this by running ./runautoconf and it will go through all the steps.