diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2014-04-01 08:24:40 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2014-04-01 08:24:40 (GMT) |
| commit | 4c0b6f5d75d2b5ee5ad7fecc840683f624d56a2a (patch) | |
| tree | d967d3f7397ffd7b3e773768c782541a5dc11c76 | |
| parent | d4b7f036fda7b1585e1a11297d394cf43e3bd380 (diff) | |
| download | tk-4c0b6f5d75d2b5ee5ad7fecc840683f624d56a2a.zip tk-4c0b6f5d75d2b5ee5ad7fecc840683f624d56a2a.tar.gz tk-4c0b6f5d75d2b5ee5ad7fecc840683f624d56a2a.tar.bz2 | |
Fix [http://core.tcl.tk/tcl/info/5bcb5026ad|5bcb5026ad]: Undefined autotools token @TK_LIBS@ in pkgconfig file
| -rw-r--r-- | unix/Makefile.in | 3 | ||||
| -rw-r--r-- | unix/tk.pc.in | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index 30ba378..1fde28d 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -731,6 +731,9 @@ install-binaries: $(TK_STUB_LIB_FILE) $(TK_LIB_FILE) ${WISH_EXE} @INSTALL_STUB_LIB@ ; \ fi @EXTRA_INSTALL_BINARIES@ + @echo "Installing pkg-config file to $(LIB_INSTALL_DIR)/pkgconfig/" + @$(INSTALL_DATA_DIR) $(LIB_INSTALL_DIR)/pkgconfig + @$(INSTALL_DATA) tk.pc $(LIB_INSTALL_DIR)/pkgconfig/tk.pc install-libraries: libraries @for i in "$(SCRIPT_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)/images" \ diff --git a/unix/tk.pc.in b/unix/tk.pc.in index d84a1cf..d3f590f 100644 --- a/unix/tk.pc.in +++ b/unix/tk.pc.in @@ -9,7 +9,6 @@ Name: The Tk Toolkit Description: Tk is a cross-platform graphical user interface toolkit, the standard GUI not only for Tcl, but for many other dynamic languages as well. URL: http://www.tcl.tk/ Version: @TK_VERSION@ -Requires: -Conflicts: -Libs: -L${libdir} @TK_LIBS@ +Requires: tcl +Libs: -L${libdir} @TK_LIB_FLAG@ @XFT_LIBS@ @XLIBSW@ Cflags: -I${includedir} |