diff options
Diffstat (limited to 'x11-toolkits/tk84/files/patch-Makefile.in')
| -rw-r--r-- | x11-toolkits/tk84/files/patch-Makefile.in | 137 |
1 files changed, 0 insertions, 137 deletions
diff --git a/x11-toolkits/tk84/files/patch-Makefile.in b/x11-toolkits/tk84/files/patch-Makefile.in deleted file mode 100644 index 7500fba36868..000000000000 --- a/x11-toolkits/tk84/files/patch-Makefile.in +++ /dev/null @@ -1,137 +0,0 @@ ---- Makefile.in.orig 2013-06-03 19:29:08.000000000 +0200 -+++ Makefile.in 2014-02-03 11:21:51.000000000 +0100 -@@ -63,6 +63,8 @@ - - # Directory in which to install the include file tk.h: - INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir) -+GENERIC_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/generic -+UNIX_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/unix - - # Path to the private tk header dir: - PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@ -@@ -99,7 +101,7 @@ - # The directory containing the Tcl sources and headers appropriate - # for this version of Tk ("srcdir" will be replaced or has already - # been replaced by the configure script): --TCL_GENERIC_DIR = @TCL_SRC_DIR@/generic -+TCL_GENERIC_DIR = @prefix@/include/tcl@TCL_VERSION@/generic - - # The directory containing the platform specific Tcl sources and headers - # appropriate for this version of Tk: -@@ -116,7 +118,7 @@ - TK_DBGX = @TK_DBGX@ - - # Flag, 1: we're building a shared lib, 0 we're not --TK_SHARED_BUILD = @TK_SHARED_BUILD@ -+TK_SHARED_BUILD = ####@TK_SHARED_BUILD@ - - # Subdirectory of $(libdir) containing the pkgIndex.tcl file for loadable Tk - TK_PKG_DIR = @TK_PKG_DIR@ -@@ -139,7 +141,7 @@ - #CFLAGS = $(CFLAGS_DEBUG) - #CFLAGS = $(CFLAGS_OPTIMIZE) - #CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE) --CFLAGS = @CFLAGS_DEFAULT@ @CFLAGS@ -+CFLAGS ?= @CFLAGS_DEFAULT@ @CFLAGS@ - - # Flags to pass to the linker - LDFLAGS_DEBUG = @LDFLAGS_DEBUG@ -@@ -498,6 +500,8 @@ - $(GENERIC_DIR)/tkIntPlatDecls.h \ - $(@TK_WINDOWINGSYSTEM@_PRIVATE_HDRS) - -+INSTALL_HDRS = tk.h tkDecls.h tkInt.h tkIntXlibDecls.h -+ - DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget - - SHELL_ENV = \ -@@ -523,6 +527,12 @@ - ${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} @LIB_RSRC_FILE@ - rm -f $@ - @MAKE_LIB@ -+ ln -sf libtk${SHORT_TK_VER}.so.1 libtk${SHORT_TK_VER}.so -+ -+libtk${SHORT_TK_VER}.a: ${OBJS} -+ rm -f libtk${SHORT_TK_VER}.a -+ ar cr libtk${SHORT_TK_VER}.a ${OBJS} -+ $(RANLIB) libtk${SHORT_TK_VER}.a - - ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} - rm -f $@ -@@ -630,7 +640,7 @@ - valgrindshell: $(TKTEST_EXE) - $(SHELL_ENV) valgrind $(VALGRINDARGS) ./$(TKTEST_EXE) $(SCRIPT) - --INSTALL_TARGETS = install-binaries install-libraries install-demos install-doc @EXTRA_INSTALL@ -+INSTALL_TARGETS = install-binaries install-libraries install-demos @EXTRA_INSTALL@ - - install: $(INSTALL_TARGETS) - -@@ -643,7 +653,7 @@ - # some ranlibs write to current directory, and this might not always be - # possible (e.g. if installing as root). - --install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) ${WISH_EXE} -+install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) libtk${SHORT_TK_VER}.a ${WISH_EXE} - @for i in "$(LIB_INSTALL_DIR)" "$(BIN_INSTALL_DIR)" "$(PKG_INSTALL_DIR)"; \ - do \ - if [ ! -d "$$i" ] ; then \ -@@ -686,20 +696,26 @@ - $(INSTALL_DATA) $(TK_BUILD_EXP_FILE) \ - $(LIB_INSTALL_DIR)/$(TK_EXP_FILE); \ - fi -+ @ln -sf $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/libtk${SHORT_TK_VER}.so -+ @echo "Installing libtk${SHORT_TK_VER}.a" -+ @$(INSTALL_DATA) libtk${SHORT_TK_VER}.a $(LIB_INSTALL_DIR)/libtk${SHORT_TK_VER}.a -+ @chmod 555 $(LIB_INSTALL_DIR)/libtk${SHORT_TK_VER}.a - @echo "Installing ${WISH_EXE} as $(BIN_INSTALL_DIR)/wish$(VERSION)" - @$(INSTALL_PROGRAM) ${WISH_EXE} "$(BIN_INSTALL_DIR)/wish$(VERSION)" -- @echo "Installing tkConfig.sh to $(CONFIG_INSTALL_DIR)/" -- @$(INSTALL_DATA) tkConfig.sh "$(CONFIG_INSTALL_DIR)/tkConfig.sh" -+ @echo "Installing tkConfig.sh to $(LIB_INSTALL_DIR)/tk$(VERSION)" -+ @mkdir -p $(LIB_INSTALL_DIR)/tk$(VERSION) -+ @$(INSTALL_DATA) tkConfig.sh "$(LIB_INSTALL_DIR)/tk$(VERSION)/tkConfig.sh" - @if test "$(STUB_LIB_FILE)" != "" ; then \ - echo "Installing $(STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \ - @INSTALL_STUB_LIB@ ; \ -- fi -+ fi; - @EXTRA_INSTALL_BINARIES@ - - install-libraries: libraries - @if test "$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)" != ""; then \ - XLIB_INCLUDE_INSTALL_DIR="$(INCLUDE_INSTALL_DIR)/X11"; fi; \ - for i in "$(INCLUDE_INSTALL_DIR)" "$${XLIB_INCLUDE_INSTALL_DIR}" \ -+ "$(GENERIC_INCLUDE_INSTALL_DIR)" "$(UNIX_INCLUDE_INSTALL_DIR)" \ - "$(SCRIPT_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)/images" \ - "$(SCRIPT_INSTALL_DIR)/msgs"; \ - do \ -@@ -714,14 +730,13 @@ - chmod +x $(SRC_DIR)/install-sh; \ - fi - @echo "Installing header files"; -- @for i in $(PUBLIC_HDRS); \ -+ ${BSD_INSTALL_DATA} $(GENERIC_DIR)/*.h $(GENERIC_INCLUDE_INSTALL_DIR)/ -+ ${BSD_INSTALL_DATA} $(UNIX_DIR)/*.h $(UNIX_INCLUDE_INSTALL_DIR) -+ @for i in $(INSTALL_HDRS) ; \ - do \ -- $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"; \ -- done; -- @list='$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)'; for i in $$list ; \ -- do \ -- $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)/X11"; \ -- done; -+ j=`basename $$i` ; \ -+ ln -sf generic/$$j $(INCLUDE_INSTALL_DIR)/$$j ; \ -+ done - @echo "Installing library files to $(SCRIPT_INSTALL_DIR)"; - @for i in $(TOP_DIR)/library/*.tcl $(GENERIC_DIR)/prolog.ps \ - $(TOP_DIR)/library/tclIndex $(UNIX_DIR)/tkAppInit.c; \ -@@ -793,6 +808,7 @@ - fi; \ - done; - @echo "Installing and cross-linking top-level (.1) docs"; -+ @mv $(TOP_DIR)/doc/wish.1 $(TOP_DIR)/doc/wish${TCL_VER}.1 - @for i in $(TOP_DIR)/doc/*.1; do \ - $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN1_INSTALL_DIR)"; \ - done |