diff options
| author | lecoanet | 2003-04-25 07:24:56 +0000 |
|---|---|---|
| committer | lecoanet | 2003-04-25 07:24:56 +0000 |
| commit | c33722ae784a0ad6b3b5d17983e5467008665933 (patch) | |
| tree | d200cdd42db7850d5d37b03ec00dfe117b193751 /Makefile.in | |
| parent | 8de5e85a63fac93e0972113e2684519d446402f7 (diff) | |
| download | tkzinc-c33722ae784a0ad6b3b5d17983e5467008665933.zip tkzinc-c33722ae784a0ad6b3b5d17983e5467008665933.tar.gz tkzinc-c33722ae784a0ad6b3b5d17983e5467008665933.tar.bz2 tkzinc-c33722ae784a0ad6b3b5d17983e5467008665933.tar.xz | |
Some fixes to improve the install process.
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/Makefile.in b/Makefile.in index eae6dd1..5beecb9 100644 --- a/Makefile.in +++ b/Makefile.in @@ -32,7 +32,7 @@ #======================================================================== tess_SOURCES = -Tkzinc_SOURCES = Track.c Tabular.c Reticle.c Map.c Rectangle.c Arc.c Curve.c \ +Tkzinc_SOURCES = Track.c Tabular.c Reticle.c Map.c Rectangle.c Arc.c Curve.c \ Item.c PostScript.c MapInfo.c Attrs.c Draw.c Geo.c List.c \ perfos.c Transfo.c Group.c Icon.c Text.c Image.c Color.c \ Field.c Triangles.c Window.c tkZinc.c @EXTRA_SOURCES@ @@ -80,8 +80,8 @@ GENERIC_HDRS = #======================================================================== lib_BINARIES = $($(PACKAGE)_LIB_FILE) -aux_BINARIES = $(Om_LIB_FILE) -bin_BINARIES = +aux_BINARIES = @aux_BINARIES@ +bin_BINARIES = @bin_BINARIES@ BINARIES = $(Tess_LIB_FILE) $(Om_LIB_FILE) $(lib_BINARIES) SHELL = @SHELL@ @@ -171,7 +171,7 @@ SHARED_BUILD = @SHARED_BUILD@ # The local includes must come first, because the TK_XINCLUDES can be # just a comment -INCLUDES = -I$(srcdir) -I$(srcdir)/libtess -I$(srcdir)/generic \ +INCLUDES = -I$(tess_dir) -I$(srcdir)/generic \ @TCL_INCLUDES@ @TK_INCLUDES@ @TK_XINCLUDES@ EXTRA_CFLAGS = $(MEM_DEBUG_FLAGS) @EXTRA_CFLAGS@ @@ -246,12 +246,14 @@ install-binaries: binaries install-lib-binaries install-bin-binaries #======================================================================== install-libraries: libraries - @mkdir -p $(DESTDIR)$(includedir) - @echo "Installing header files in $(DESTDIR)$(includedir)" - @for i in $(GENERIC_HDRS) ; do \ + @if test "x$(GENERIC_HDRS)" != "x"; then \ + mkdir -p $(DESTDIR)$(includedir); \ + echo "Installing header files in $(DESTDIR)$(includedir)"; \ + for i in "$(GENERIC_HDRS)" ; do \ echo "Installing $$i" ; \ $(INSTALL_DATA) $$i $(DESTDIR)$(includedir) ; \ - done; + done; \ + fi #======================================================================== # This rule installs the demos files and associated images. @@ -470,7 +472,7 @@ install-lib-binaries: # Construct a full pkgIndex in the installation directory (cd $(DESTDIR)$(pkglibdir); \ (echo package require Tk \; pkg_mkIndex -load Tk . $($(PACKAGE)_LIB_FILE) \ - $(RUNTIME_SOURCES) \; exit;) | $(TCLSH)) + $(RUNTIME_SOURCES) \; exit;) | $(WISH)) #======================================================================== # Install binary executables (e.g. .exe files and dependent .dll files) |