X-Git-Url: http://www.wagner.pp.ru/gitweb/?a=blobdiff_plain;f=dll%2FMakefile.in;fp=dll%2FMakefile.in;h=194246eba18bc4dc2e6db99fa5ab50b88ca08961;hb=349ccc7f5d161a4d10ac72cf16ea5073fe071b4e;hp=92c9c1624b2a70ebb5075f9e710214d04be4c96c;hpb=c5a9bf19ca03b1c193bc8413b1332e2ed499e280;p=oss%2Ffgis.git

diff --git a/dll/Makefile.in b/dll/Makefile.in
index 92c9c16..194246e 100644
--- a/dll/Makefile.in
+++ b/dll/Makefile.in
@@ -79,7 +79,9 @@ OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 STRIP = @STRIP@
-TCL_INCLUDE = @TCL_INCLUDE@
+TCL_INC_DIR = @TCL_INC_DIR@
+TCL_PACKAGE_PATH = @TCL_PACKAGE_PATH@
+TK_INC_DIR = @TK_INC_DIR@
 VERSION = @VERSION@
 YACC = @YACC@
 am__include = @am__include@
@@ -90,9 +92,7 @@ fgis_la_LDFLAGS = -module -avoid-version
 lib_LTLIBRARIES = fgis.la
 fgis_la_SOURCES = fgisInit.c fgisMisc.c fgisPalette.c fgisRaster.c fgisPlanchet.c fgisEppCalc.c fgisEppDraw.c fgisVector.c fgisPatterns.c fgisProjection.c fgis.h fgisInt.h
 
-FGIS_HOME = $(sysconfdir)
-INCLUDES = $(TCL_INCLUDE) -I$(top_srcdir)/include
-DEFS = @DEFS@
+INCLUDES = -I$(TCL_INC_DIR) -I$(TK_INC_DIR) -I$(top_srcdir)/include
 subdir = dll
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/include/config.h
@@ -104,6 +104,8 @@ am_fgis_la_OBJECTS = fgisInit.lo fgisMisc.lo fgisPalette.lo \
 	fgisRaster.lo fgisPlanchet.lo fgisEppCalc.lo fgisEppDraw.lo \
 	fgisVector.lo fgisPatterns.lo fgisProjection.lo
 fgis_la_OBJECTS = $(am_fgis_la_OBJECTS)
+
+DEFS = @DEFS@
 DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
@@ -363,6 +365,7 @@ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
 	mostlyclean-generic mostlyclean-libtool tags uninstall \
 	uninstall-am uninstall-info-am uninstall-libLTLIBRARIES
 
+# DEFS = @DEFS@
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: