diff options
Diffstat (limited to 'x11-toolkits/tk86/files/patch-unix__Makefile.in')
| -rw-r--r-- | x11-toolkits/tk86/files/patch-unix__Makefile.in | 110 |
1 files changed, 110 insertions, 0 deletions
diff --git a/x11-toolkits/tk86/files/patch-unix__Makefile.in b/x11-toolkits/tk86/files/patch-unix__Makefile.in new file mode 100644 index 000000000000..f93cefd929aa --- /dev/null +++ b/x11-toolkits/tk86/files/patch-unix__Makefile.in @@ -0,0 +1,110 @@ +--- Makefile.in.orig 2013-09-17 14:25:13.000000000 +0200 ++++ Makefile.in 2014-02-03 12:02:57.000000000 +0100 +@@ -64,6 +64,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@ +@@ -92,7 +94,7 @@ + HTML_INSTALL_DIR = $(INSTALL_ROOT)$(HTML_DIR) + + # Directory in which to install the configuration file tkConfig.sh: +-CONFIG_INSTALL_DIR = $(INSTALL_ROOT)$(libdir) ++CONFIG_INSTALL_DIR = $(SCRIPT_INSTALL_DIR) + + # Directory in which to install the demo files: + DEMO_INSTALL_DIR = $(INSTALL_ROOT)$(TK_LIBRARY)/demos +@@ -555,6 +557,8 @@ + PUBLIC_HDRS = $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDecls.h \ + $(GENERIC_DIR)/tkPlatDecls.h $(@TK_WINDOWINGSYSTEM@_HDRS) + ++INSTALL_HDRS = tk.h tkDecls.h tkInt.h tkIntXlibDecls.h ++ + # The private headers we want installed for install-private-headers + PRIVATE_HDRS = $(GENERIC_DIR)/tkInt.h $(GENERIC_DIR)/tkIntDecls.h \ + $(GENERIC_DIR)/tkIntPlatDecls.h $(GENERIC_DIR)/tkPort.h \ +@@ -584,6 +588,12 @@ + ${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} @LIB_RSRC_FILE@ + rm -f $@ + @MAKE_LIB@ ++ @ln -sf ${LIB_FILE} ./libtk${SHORT_TK_VER}.so ++ ++libtk${SHORT_TK_VER}.a: ${OBJS} ++ rm -f libtk${SHORT_TK_VER}.a ++ ar rc libtk${SHORT_TK_VER}.a ${OBJS} ++ $(RANLIB) libtk${SHORT_TK_VER}.a + + ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} + rm -f $@ +@@ -699,8 +709,7 @@ + INSTALL_DEV_TARGETS = install-headers + INSTALL_DEMO_TARGETS = install-demos + INSTALL_EXTRA_TARGETS = @EXTRA_INSTALL@ +-INSTALL_TARGETS = $(INSTALL_BASE_TARGETS) $(INSTALL_DOC_TARGETS) $(INSTALL_DEV_TARGETS) \ +- $(INSTALL_DEMO_TARGETS) $(INSTALL_EXTRA_TARGETS) ++INSTALL_TARGETS = $(INSTALL_BASE_TARGETS) $(INSTALL_DEV_TARGETS) $(INSTALL_EXTRA_TARGETS) + + install: $(INSTALL_TARGETS) + +@@ -713,7 +722,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) ${WISH_EXE} ++install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) libtk${SHORT_TK_VER}.a ${WISH_EXE} + @for i in "$(LIB_INSTALL_DIR)" "$(BIN_INSTALL_DIR)" \ + "$(PKG_INSTALL_DIR)" "$(CONFIG_INSTALL_DIR)" ; \ + do \ +@@ -744,6 +753,10 @@ + @echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/" + @@INSTALL_LIB@ + @chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)" ++ @ln -sf $(TK_LIB_FILE) "@DLL_INSTALL_DIR@"/libtk${SHORT_TK_VER}.so ++ @echo "Installing libtk${SHORT_TK_VER}.a" ++ @$(INSTALL_DATA) libtk${SHORT_TK_VER}.a "@DLL_INSTALL_DIR@"/libtk${SHORT_TK_VER}.a ++ @chmod 555 "@DLL_INSTALL_DIR@"/libtk${SHORT_TK_VER}.a + @if test -f "tk${MAJOR_VERSION}${MINOR_VERSION}.dll"; then \ + $(INSTALL_LIBRARY) "tk${MAJOR_VERSION}${MINOR_VERSION}.dll" "$(DLL_INSTALL_DIR)";\ + chmod 555 "$(DLL_INSTALL_DIR)/tk${MAJOR_VERSION}${MINOR_VERSION}.dll";\ +@@ -759,9 +772,9 @@ + @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 ++ @echo "Installing pkg-config file to $(INSTALL_ROOT)$(prefix)/libdata/pkgconfig/" ++ @$(INSTALL_DATA_DIR) $(INSTALL_ROOT)$(prefix)/libdata/pkgconfig ++ @$(INSTALL_DATA) tk.pc $(INSTALL_ROOT)$(prefix)/libdata/pkgconfig/tk.pc + + install-libraries: libraries + @for i in "$(SCRIPT_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)/images" \ +@@ -859,7 +872,8 @@ + install-headers: + @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}"; \ ++ for i in "$(INCLUDE_INSTALL_DIR)" "$${XLIB_INCLUDE_INSTALL_DIR}" \ ++ "$(GENERIC_INCLUDE_INSTALL_DIR)" "$(UNIX_INCLUDE_INSTALL_DIR)"; \ + do \ + if [ -n "$$i" -a ! -d "$$i" ] ; then \ + echo "Making directory $$i"; \ +@@ -868,9 +882,12 @@ + fi; \ + done; + @echo "Installing header files to $(INCLUDE_INSTALL_DIR)/"; +- @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)"; \ ++ j=`basename $$i` ; \ ++ ln -sf generic/$$j "$(INCLUDE_INSTALL_DIR)"/$$j ; \ + done; + @list='$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)'; for i in $$list ; \ + do \ |