X-Git-Url: http://www.wagner.pp.ru/gitweb/?p=oss%2Ffgis.git;a=blobdiff_plain;f=tcl%2FMakefile.in;fp=tcl%2FMakefile.in;h=e5b8abaf490aaaf17f0d26c2ea1cf2154e847e5a;hp=4a9472ba171496330290eb75b4eca75e50f5c51f;hb=05960800e662deedeb452b2739cf0924e28fbf41;hpb=d0a2b35e3b85abdf23f7ec4d5cbab26ae4addc3a

diff --git a/tcl/Makefile.in b/tcl/Makefile.in
index 4a9472b..e5b8aba 100644
--- a/tcl/Makefile.in
+++ b/tcl/Makefile.in
@@ -72,9 +72,9 @@ CC = @CC@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 ECHO = @ECHO@
-FGIS_CONFIG = @FGIS_CONFIG@
+FGIS_CONFDIR = @FGIS_CONFDIR@
 FGIS_LIBDIR = @FGIS_LIBDIR@
-FGIS_SCRIPTS = @FGIS_SCRIPTS@
+FGIS_SCRIPTDIR = @FGIS_SCRIPTDIR@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LIBEPP = @LIBEPP@
 LIBTOOL = @LIBTOOL@
@@ -94,6 +94,8 @@ install_sh = @install_sh@
 
 bin_SCRIPTS = hypermap mapview
 SCRIPT_LIST = admin.layer balloonhelp.tcl calculator.tcl combobox.tcl console.tcl draw.tcl getopt.tcl help.tcl hierarchy.tcl html_library.tcl layer.tcl legend.tcl lesras.lay objects.tcl planchet.tcl progressbar.tcl tabnotebook.tcl tclIndex toolbar.tcl ventry.tcl viewer.tcl widget.tcl
+
+EXTRA_DIST = $(bin_SCRIPTS) $(SCRIPT_LIST)
 subdir = tcl
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/include/config.h
@@ -179,7 +181,6 @@ installdirs:
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
 install-exec: install-exec-am
 install-data: install-data-am
-uninstall: uninstall-am
 
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
@@ -258,16 +259,25 @@ install-binaries:
 	done
 
 install-libraries:
-	$(mkinstalldirs) $(FGIS_SCRIPTS)
+	$(mkinstalldirs) $(FGIS_SCRIPTDIR)
 	-for i in $(SCRIPT_LIST) ; do \
 	  if [ -f $$i ] ; then \
-	    $(INSTALL_PROGRAM) -m 644 $$i $(FGIS_SCRIPTS)/$$i ; \
+	    $(INSTALL_PROGRAM) -m 644 $$i $(FGIS_SCRIPTDIR)/$$i ; \
 	  else true; fi ; \
 	done
 	$(mkinstalldirs) $(TCL_PACKAGE_PATH)/fgis
 	if [ -f pkgIndex.tcl  ] ; then \
 	    $(INSTALL_PROGRAM) -m 644 pkgIndex.tcl $(TCL_PACKAGE_PATH)/fgis/pkgIndex.tcl ; \
 	else true; fi
+
+uninstall:
+	-for i in $(bin_SCRIPTS) ; do \
+	  rm -f $(bindir)/$$i ; \
+	done
+	-for i in $(SCRIPT_LIST) ; do \
+	  rm -f $(FGIS_SCRIPTDIR)/$$i ; \
+	done
+	-rm -f $(TCL_PACKAGE_PATH)/fgis/pkgIndex.tcl
 # 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: