install_tclxpa

Gbp-Pq: Name install_tclxpa.patch

diff --git a/Makefile.in b/Makefile.in
index b4db0b9577ed83012c18694e827aca9744b4a11e..94653b195052cc7dd0ec6308907d5694e039b2fe 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -38,6 +38,7 @@ INSTALL_ROOT = $(DESTDIR)
 
 # Directory in which to install the .a or .so binary for the XPA library:
 LIB_INSTALL_DIR =      $(INSTALL_ROOT)$(exec_prefix)/lib
+TCL_LIB_INSTALL_DIR =  $(LIB_INSTALL_DIR)/tcltk/xpa
 
 # Directory in which to install the program wish:
 BIN_INSTALL_DIR =      $(INSTALL_ROOT)$(exec_prefix)/bin
@@ -142,7 +143,7 @@ GTK_OBJS =  gtkloop.o
 INCL   =       xpa.h xpap.h
 
 # these are all the modules going into the "normal" xpa library
-LIBOBJS =      ${BASE_OBJS} ${TCL_OBJS} ${XT_OBJS} ${GTK_OBJS}
+LIBOBJS =      ${BASE_OBJS} ${XT_OBJS} ${GTK_OBJS}
 LIB =  libxpa.a
 
 # used in link line
@@ -167,6 +168,8 @@ install::   install-man
 
 install::      install-share
 
+install::      tclxpa_install
+
 lib:           $(LIB) $(DOSHARED)
 
 $(LIB):                $(LIBOBJS)
@@ -191,14 +194,17 @@ mingw-dll:        $(LIBOBJS)
                -e _LibMain@12 -Wl,--image-base,0x1C000000 -o libxpa.dll \
                -luser32 -lwsock32
 
-tclxpa:                $(LIB)
-               @(rm -rf libtclxpa.tmp; mkdir libtclxpa.tmp; \
-               (cd libtclxpa.tmp && ar x ../lib$(PACKAGE).a); \
-               rm -f libtclxpa.tmp/xt*.o; \
-               CC='$(CC)' CXX=$(CXX) \
-               ./mklib -o tclxpa libtclxpa.tmp/*.o $(TCL_LIBS); \
-               test -r libtclxpa.dylib && cp -p libtclxpa.dylib libtclxpa.so && echo "copying libtclxpa.dylib to libtclxpa.so"; \
-               rm -rf libtclxpa.tmp)
+
+tclxpa:                $(TCL_OBJS) 
+               ar cruv libtclxpa.a $(TCL_OBJS)
+               $(RANLIB) libtclxpa.a
+
+shtclxpa:      tclxpa
+               @(rm -rf $(PACKAGE)tmp; mkdir $(PACKAGE)tmp; \
+               (cd $(PACKAGE)tmp && ar x ../libtclxpa.a); \
+               CC='$(CC)' CXX='$(CXX)' \
+               ./mklib -o tclxpa -L. -lxpa $(PACKAGE)tmp/*.o $(TCL_LIBS); \
+               rm -rf $(PACKAGE)tmp; )
 
 diff:
                -(for f in `ls *.c`;                                    \
@@ -257,7 +263,7 @@ smoke:  ctest stest
 _install:
 
 shlib_install:
-       @-(for i in `ls *.so* *.dylib *.sl 2>/dev/null` ; \
+       @-(for i in `ls libxpa.so* *.dylib *.sl 2>/dev/null` ; \
           do \
           if [ -h $$i ] ; then \
                echo "Installing link $$i" ; \
@@ -269,6 +275,11 @@ shlib_install:
           fi; \
           done;)
 
+tclxpa_install: shtclxpa
+       mkdir -p $(TCL_LIB_INSTALL_DIR)
+       $(INSTALL_DATA) libtclxpa.so $(TCL_LIB_INSTALL_DIR)
+       $(INSTALL_DATA) pkgIndex.tcl $(TCL_LIB_INSTALL_DIR)
+
 install-binaries: $(LIB) $(PROGS)
        @for i in $(LIB_INSTALL_DIR) $(INCLUDE_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
            do \

diff --git a/tcl.c b/tcl.c
index 929bca4f43df35a8f22914222da9dff63a9fcecf..1451f9fa7725acc12c8496afbd6fb9959817ab31 100644 (file)
--- a/tcl.c
+++ b/tcl.c
@@ -971,7 +971,7 @@ static int XPARec_Tcl(clientData, interp, objc, objv)
     /* create new tcl variable for this socket */
     else{
       /* create a tcl channel corresponding to the xpa socket */
-      if( !(chan = Tcl_MakeTcpClientChannel((ClientData)xpa_cmdfd(xpa))) ){
+      if( !(chan = Tcl_MakeTcpClientChannel((ClientData)(intptr_t)xpa_cmdfd(xpa))) ){
        Tcl_SetResult(interp, "XPA$ERROR: could not map XPA cmdfd to tcl",
                      TCL_STATIC);
        result = TCL_ERROR;
@@ -1013,7 +1013,7 @@ static int XPARec_Tcl(clientData, interp, objc, objv)
     }
     /* create new tcl variable for this socket */
     else{
-      if( !(chan = Tcl_MakeTcpClientChannel((ClientData)xpa_datafd(xpa))) ){
+      if( !(chan = Tcl_MakeTcpClientChannel((ClientData)(intptr_t)xpa_datafd(xpa))) ){
        Tcl_SetResult(interp, "XPA$ERROR: could not map XPA datafd to tcl",
                      TCL_STATIC);
        result = TCL_ERROR;