Differences From Artifact [8ddec86d4db2a4c6]:
- File
Makefile.in
-
2011-04-08 02:54:32
- part of checkin
[cc27dc19ef]
on branch trunk
- Update linenoise to the latest version
From https://github.com/msteveb/linenoise with minor changes.
- Optimise common insert/remove char cases - Add completion framework (unused in Jim Tcl)
Signed-off-by: Steve Bennett <steveb@workware.net.au> (user: steveb@workware.net.au
-
2011-04-08 02:54:32
- part of checkin
[cc27dc19ef]
on branch trunk
- Update linenoise to the latest version
To Artifact [8856e5024c3124c6]:
- File
Makefile.in
-
2011-05-24 03:36:52
- part of checkin
[3c76ac95a4]
on branch trunk
- Fix usage of DESTDIR to ensure proper install dest
Signed-off-by: Steve Bennett <steveb@workware.net.au> (user: steveb@workware.net.au
-
2011-05-24 03:36:52
- part of checkin
[3c76ac95a4]
on branch trunk
- Fix usage of DESTDIR to ensure proper install dest
11 11 SHOBJ_CFLAGS ?= @SHOBJ_CFLAGS@
12 12 SHOBJ_LDFLAGS ?= @SHOBJ_LDFLAGS@
13 13 CFLAGS = @CFLAGS@
14 14 LDFLAGS = @LDFLAGS@
15 15 LDLIBS += @LIBS@
16 16 exec_prefix ?= @exec_prefix@
17 17 prefix ?= @prefix@
18 -DESTDIR ?= $(prefix)
19 18
20 19 # Set an initial, default library and auto_path
21 20 CPPFLAGS += -DTCL_LIBRARY=\"@TCL_LIBRARY@\"
22 21
23 22 CPPFLAGS += -DTCL_PLATFORM_OS=\"@PLATFORM_OS@\" -DTCL_PLATFORM_PLATFORM=\"@PLATFORM_PLATFORM@\"
24 23 CPPFLAGS += -DJIM_REFERENCES -D_GNU_SOURCE -DNO_COMPLETION
25 24
................................................................................
57 56
58 57 docs: Tcl.html
59 58
60 59 $(JIMSH): $(LIBJIM) jimsh.o
61 60 $(CC) $(CFLAGS) @LINKFLAGS@ $(LDFLAGS) -o $@ jimsh.o $(LIBJIM) $(LDLIBS) -lm
62 61
63 62 install: all docs $(EXTENSION_TCL)
64 - install -d $(DESTDIR)/bin
65 - install $(JIMSH) $(DESTDIR)/bin
66 - install -d $(DESTDIR)/lib/jim
67 - install $(LIBJIM) $(DESTDIR)/lib
68 - install @srcdir@/README.extensions $(EXTENSION_MODS) $(EXTENSION_TCL) $(DESTDIR)/lib/jim
69 - install -d $(DESTDIR)/include
63 + install -d $(DESTDIR)$(prefix)/bin
64 + install $(JIMSH) $(DESTDIR)$(prefix)/bin
65 + install -d $(DESTDIR)$(prefix)/lib/jim
66 + install $(LIBJIM) $(DESTDIR)$(prefix)/lib
67 + install @srcdir@/README.extensions $(EXTENSION_MODS) $(EXTENSION_TCL) $(DESTDIR)$(prefix)/lib/jim
68 + install -d $(DESTDIR)$(prefix)/include
70 69 install @srcdir@/jim.h @srcdir@/jim-eventloop.h @srcdir@/jim-nvp.h @srcdir@/jim-signal.h \
71 - @srcdir@/jim-subcmd.h @srcdir@/jim-win32compat.h $(DESTDIR)/include
72 - install jim-config.h $(DESTDIR)/include
73 - install -d $(DESTDIR)/doc/jim
74 - install Tcl.html $(DESTDIR)/doc/jim
70 + @srcdir@/jim-subcmd.h @srcdir@/jim-win32compat.h $(DESTDIR)$(prefix)/include
71 + install jim-config.h $(DESTDIR)$(prefix)/include
72 + install -d $(DESTDIR)$(prefix)/doc/jim
73 + install Tcl.html $(DESTDIR)$(prefix)/doc/jim
75 74
76 75 test:
77 76 $(MAKE) jimsh=$(shell pwd)/jimsh -C tests
78 77
79 78 $(OBJS) $(EXTENSION_OBJS): Makefile
80 79
81 80 ifneq (@JIM_UTF8@,)