diff options
| author | Steve Bennett <steveb@workware.net.au> | 2011-07-18 09:41:46 +1000 |
|---|---|---|
| committer | Steve Bennett <steveb@workware.net.au> | 2011-07-18 09:41:46 +1000 |
| commit | e46851db8294d66e97e0a98a689f0a562deded4e (patch) | |
| tree | d7d0a839f9e0fcb76cb7bab7fa43775ec479099d | |
| parent | a36733634abd60b973979431718d4af889611121 (diff) | |
| download | jimtcl-e46851db8294d66e97e0a98a689f0a562deded4e.zip jimtcl-e46851db8294d66e97e0a98a689f0a562deded4e.tar.gz jimtcl-e46851db8294d66e97e0a98a689f0a562deded4e.tar.bz2 | |
Allow install to be a no-op with --disable-install-jim
When running under automake (as openocd does) it seems
impossible to build jimtcl but not install it, so add
--disable-install-jim to help out.
Signed-off-by: Steve Bennett <steveb@workware.net.au>
| -rw-r--r-- | Makefile.in | 5 | ||||
| -rw-r--r-- | auto.def | 7 |
2 files changed, 12 insertions, 0 deletions
diff --git a/Makefile.in b/Makefile.in index 73c9cc8..7932f32 100644 --- a/Makefile.in +++ b/Makefile.in @@ -16,6 +16,7 @@ LDFLAGS = @LDFLAGS@ LDLIBS += @LIBS@ exec_prefix ?= @exec_prefix@ prefix ?= @prefix@ +install_jim = @install_jim@ CPPFLAGS += -D_GNU_SOURCE -Wall -Werror $(OPTIM) -I. ifneq (@srcdir@,.) @@ -59,6 +60,7 @@ docs: Tcl.html $(JIMSH): $(LIBJIM) jimsh.o _initjimsh.o $(CC) $(CFLAGS) @SH_LINKFLAGS@ $(LDFLAGS) -o $@ jimsh.o _initjimsh.o $(LIBJIM) $(LDLIBS) +ifdef install_jim install: all docs $(EXTENSION_TCL) install-exec mkdir -p $(DESTDIR)$(prefix)/lib/jim cp $(LIBJIM) $(DESTDIR)$(prefix)/lib @@ -80,6 +82,9 @@ uninstall: for i in README.extensions $(C_EXT_SHOBJS) $(EXTENSION_TCL); do rm -f $(DESTDIR)$(prefix)/lib/jim/$$i; done rm -f $(DESTDIR)$(prefix)/include/jim*.h rm -f $(DESTDIR)$(prefix)/doc/jim/Tcl.html +else +install install-exec uninstall: +endif test: $(JIMSH) $(DEF_LD_PATH) $(MAKE) jimsh=`pwd`/jimsh -C @srcdir@/tests @@ -55,6 +55,8 @@ options { Specify jim extensions to build as separate modules (either C or Tcl). Note that not all extensions can be built as loadable modules. } + # To help out openocd with automake + install-jim=1 } cc-check-types "long long" @@ -152,6 +154,11 @@ if {[opt-bool shared with-jim-shared]} { msg-result "Building static library" define JIM_LIBTYPE static } +if {[opt-bool install-jim]} { + define install_jim 1 +} else { + define install_jim "" +} # Note: Extension handling is mapped directly from the configure.ac # implementation |