diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-02-12 08:50:39 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-02-12 08:50:39 (GMT) |
| commit | 7c2cfc0a5e7d38d351046f71da2b2136036197ff (patch) | |
| tree | 37db268a589ddb4c58dfe11b024b0653b739c290 /unix | |
| parent | 5d6c8b7a50f680c200d19ecb11ab08c90416eec8 (diff) | |
| download | tk-7c2cfc0a5e7d38d351046f71da2b2136036197ff.zip tk-7c2cfc0a5e7d38d351046f71da2b2136036197ff.tar.gz tk-7c2cfc0a5e7d38d351046f71da2b2136036197ff.tar.bz2 | |
Now that TIP #430 works for Tk, no longer install tk_library/tk.tcl and friends in <prefix>/lib/tk8.7
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/Makefile.in | 2 | ||||
| -rwxr-xr-x | unix/configure | 4 | ||||
| -rw-r--r-- | unix/configure.ac | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index b830c4e..c7e52bd 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -755,7 +755,7 @@ valgrind: $(TKTEST_EXE) valgrindshell: $(TKTEST_EXE) $(SHELL_ENV) valgrind $(VALGRINDARGS) ./$(TKTEST_EXE) $(SCRIPT) -INSTALL_BASE_TARGETS = install-binaries install-libraries +INSTALL_BASE_TARGETS = install-binaries ${INSTALL_LIBRARIES} INSTALL_DOC_TARGETS = install-doc INSTALL_DEV_TARGETS = install-headers INSTALL_DEMO_TARGETS = install-demos diff --git a/unix/configure b/unix/configure index a51070d..8806645 100755 --- a/unix/configure +++ b/unix/configure @@ -8851,14 +8851,14 @@ if test "${ZIPFS_BUILD}" = 1; then printf "%s\n" "#define ZIPFS_BUILD 2" >>confdefs.h - INSTALL_LIBRARIES=install-libraries-zipfs-static + INSTALL_LIBRARIES=install-demos { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } else printf "%s\n" "#define ZIPFS_BUILD 1" >>confdefs.h \ - INSTALL_LIBRARIES=install-libraries-zipfs-shared + INSTALL_LIBRARIES=install-demos { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } fi diff --git a/unix/configure.ac b/unix/configure.ac index ba34137..025bcfd 100644 --- a/unix/configure.ac +++ b/unix/configure.ac @@ -689,11 +689,11 @@ if test "${ZIPFS_BUILD}" = 1; then if test "${SHARED_BUILD}" = 0; then ZIPFS_BUILD=2; AC_DEFINE(ZIPFS_BUILD, 2, [Are we building with zipfs enabled?]) - INSTALL_LIBRARIES=install-libraries-zipfs-static + INSTALL_LIBRARIES=install-demos AC_MSG_RESULT([yes]) else AC_DEFINE(ZIPFS_BUILD, 1, [Are we building with zipfs enabled?])\ - INSTALL_LIBRARIES=install-libraries-zipfs-shared + INSTALL_LIBRARIES=install-demos AC_MSG_RESULT([yes]) fi else |