diff options
| author | Steve Bennett <steveb@workware.net.au> | 2018-02-19 07:49:04 +1000 |
|---|---|---|
| committer | Steve Bennett <steveb@workware.net.au> | 2018-07-25 15:30:45 +1000 |
| commit | 630df0da46f4237de851c8a44ecb0b382549c67c (patch) | |
| tree | 8a6c0ff03f8aea10c22160d3d7d17b278595334a /Makefile.in | |
| parent | 3e37fe8cb2f93fd385179d7e420656982a6ab709 (diff) | |
| download | jimtcl-630df0da46f4237de851c8a44ecb0b382549c67c.zip jimtcl-630df0da46f4237de851c8a44ecb0b382549c67c.tar.gz jimtcl-630df0da46f4237de851c8a44ecb0b382549c67c.tar.bz2 | |
Update autosetup to v0.6.8
autosetup changes:
- The syntax for templates has changed slightly
- Update config.guess and config.sub to 2018-03-08
- Add rpath support
- Add --runstatedir
Also:
- enable rpath when building libjim as shared
- ensure that 'make test' works on MacOS when libjim is shared
Signed-off-by: Steve Bennett <steveb@workware.net.au>
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in index 51435c1..1cb7144 100644 --- a/Makefile.in +++ b/Makefile.in @@ -44,7 +44,7 @@ docdir = @docdir@ CC += -Wall $(OPTIM) -I. CXX += -Wall $(OPTIM) -I. -@if srcdir != . +@if [get-define srcdir] ne "." CFLAGS += -I@srcdir@ CXXFLAGS += -I@srcdir@ VPATH := @srcdir@ @@ -93,7 +93,7 @@ all: $(JIMSH) @C_EXT_SHOBJS@ $(JIMSH): $(LIBJIM) jimsh.o initjimsh.o $(ECHO) " LINK $@" - $(Q)$(JIMSH_CC) @SH_LINKFLAGS@ $(LDFLAGS) -o $@ jimsh.o initjimsh.o $(LIBJIM) $(LDLIBS) $(LIBS) + $(Q)$(JIMSH_CC) @SH_LINKRPATH_FLAGS@ @SH_LINKFLAGS@ $(LDFLAGS) -o $@ jimsh.o initjimsh.o $(LIBJIM) $(LDLIBS) $(LIBS) @if JIM_INSTALL install: all @TCL_EXTS@ install-exec install-docs @@ -253,17 +253,17 @@ zlib.so: jim-zlib.c docs: Tcl.html -@if INSTALL_DOCS == nodocs +@if INSTALL_DOCS eq "nodocs" install-docs: @endif -@if INSTALL_DOCS == docs +@if INSTALL_DOCS eq "docs" install-docs: docs $(INSTALL_DATA_DIR) $(DESTDIR)$(docdir) $(INSTALL_DATA) Tcl.html $(DESTDIR)$(docdir) @endif -@if INSTALL_DOCS == shipped +@if INSTALL_DOCS eq "shipped" install-docs: $(INSTALL_DATA_DIR) $(DESTDIR)$(docdir) @echo "Warning: asciidoc not available - installing Tcl_shipped.html" |