diff -ur xpa-2.1.11/Makefile.in xpa-2.1.11.new/Makefile.in
--- xpa-2.1.11/Makefile.in	2009-10-05 18:46:56.000000000 +0200
+++ xpa-2.1.11.new/Makefile.in	2009-12-22 15:05:06.000000000 +0100
@@ -37,19 +37,19 @@
 INSTALL_ROOT =
 
 # Directory in which to install the .a or .so binary for the XPA library:
-LIB_INSTALL_DIR =	$(INSTALL_ROOT)$(exec_prefix)/lib
+LIB_INSTALL_DIR =	$(INSTALL_ROOT)$(libdir)
 
 # Directory in which to install the program wish:
-BIN_INSTALL_DIR =	$(INSTALL_ROOT)$(exec_prefix)/bin
+BIN_INSTALL_DIR =	$(INSTALL_ROOT)$(bindir)
 
 # Directory in which to install the include file xpa.h:
-INCLUDE_INSTALL_DIR =	$(INSTALL_ROOT)$(prefix)/include
+INCLUDE_INSTALL_DIR =	$(INSTALL_ROOT)$(includedir)
 
 # Top-level directory for manual entries:
-MAN_INSTALL_DIR =	$(INSTALL_ROOT)$(prefix)/man
+MAN_INSTALL_DIR =	$(INSTALL_ROOT)$(mandir)
 
 # Top-level directory for share entries:
-MAN_SHARE_DIR =		$(INSTALL_ROOT)$(prefix)/share/xpa
+MAN_SHARE_DIR =		$(INSTALL_ROOT)$(datadir)
 
 # Platform-specific X compiler flags (include file specifications)
 X_CFLAGS = 		@X_CFLAGS@
@@ -102,6 +102,29 @@
 INSTALL_PROGRAM =	${INSTALL}
 INSTALL_DATA =		${INSTALL} -m 644
 
+# Added by fedora rpm patch
+bindir = @bindir@
+build_alias = @build_alias@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host_alias = @host_alias@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+# end
+
 #----------------------------------------------------------------
 # The information below is modified by the configure script when
 # Makefile is generated from Makefile.in.  You shouldn't normally
@@ -147,7 +170,7 @@
 
 # used in link line
 # LLIB=	$(LIB)
-LLIB=	@LLIB@
+LLIB= -L. -lxpa
 
 PROGS =		xpaset xpaget xpainfo xpaaccess xpans xpamb
 
@@ -175,7 +198,7 @@
 		$(RANLIB) $(LIB)
 
 shlib:		$(LIB)
-		@(rm -rf lib$(PACKAGE).tmp; mkdir lib$(PACKAGE).tmp; \
+		@(rm -rf lib$(PACKAGE).tmp; mkdir -p lib$(PACKAGE).tmp; \
 		(cd lib$(PACKAGE).tmp && ar x ../lib$(PACKAGE).a); \
 		rm -f lib$(PACKAGE).tmp/xt*.o; \
 		rm -f lib$(PACKAGE).tmp/tcl*.o; \
@@ -192,7 +215,7 @@
 		-luser32 -lwsock32
 
 tclxpa:		$(LIB)
-		@(rm -rf libtclxpa.tmp; mkdir libtclxpa.tmp; \
+		@(rm -rf libtclxpa.tmp; mkdir -p libtclxpa.tmp; \
 		(cd libtclxpa.tmp && ar x ../lib$(PACKAGE).a); \
 		rm -f libtclxpa.tmp/xt*.o; \
 		CC='$(CC)' CXX=$(CXX) \
@@ -212,34 +235,34 @@
 		echo "pkg_mkIndex -direct -verbose . libtclxpa.so; exit"| tclsh)
 
 xpaset:		$(LIB) xpaset.o
-		$(CC) $(LDFLAGS) xpaset.o -o xpaset $(LLIB) $(LIBS)
+		$(CC) $(CFLAGS) -fno-PIC $(LDFLAGS) xpaset.o -o xpaset $(LLIB) $(LIBS)
 
 xpaget:		$(LIB) xpaget.o
-		$(CC) $(LDFLAGS) xpaget.o -o xpaget $(LLIB) $(LIBS)
+		$(CC) $(CFLAGS) -fno-PIC $(LDFLAGS) xpaget.o -o xpaget $(LLIB) $(LIBS)
 
 xpainfo:	$(LIB) xpainfo.o
-		$(CC) $(LDFLAGS) xpainfo.o -o xpainfo $(LLIB) $(LIBS)
+		$(CC) $(CFLAGS) -fno-PIC $(LDFLAGS) xpainfo.o -o xpainfo $(LLIB) $(LIBS)
 
 xpaaccess:	$(LIB) xpaaccess.o
-		$(CC) $(LDFLAGS) xpaaccess.o -o xpaaccess $(LLIB) $(LIBS)
+		$(CC) $(CFLAGS) -fno-PIC $(LDFLAGS) xpaaccess.o -o xpaaccess $(LLIB) $(LIBS)
 
 xpans:		$(LIB) xpans.o
-		$(CC) $(LDFLAGS) xpans.o -o xpans $(LLIB) $(LIBS) $(TLIB)
+		$(CC) $(CFLAGS) -fno-PIC $(LDFLAGS) xpans.o -o xpans $(LLIB) $(LIBS) $(TLIB)
 
 xpamb:		$(LIB) xpamb.o
-		$(CC) $(LDFLAGS) xpamb.o -o xpamb $(LLIB) $(LIBS)
+		$(CC) $(CFLAGS) -fno-PIC $(LDFLAGS) xpamb.o -o xpamb $(LLIB) $(LIBS)
 
 ctest:		$(LIB) ctest.o
-		$(CC) $(LDFLAGS) ctest.o -o ctest $(LLIB) $(LIBS)
+		$(CC) $(CFLAGS) -fno-PIC $(LDFLAGS) ctest.o -o ctest $(LLIB) $(LIBS)
 
 stest:		$(LIB) stest.o
-		$(CC) $(LDFLAGS) stest.o -o stest $(LIB) $(LIBS)
+		$(CC) $(CFLAGS) -fno-PIC $(LDFLAGS) stest.o -o stest $(LIB) $(LIBS)
 
 rtest:		$(LIB) rtest.o
-		$(CC) $(LDFLAGS) rtest.o -o rtest $(LIB) $(LIBS)
+		$(CC) $(CFLAGS) -fno-PIC $(LDFLAGS) rtest.o -o rtest $(LIB) $(LIBS)
 
 stestx:		$(LIB) stest.o
-		$(CC) $(LDFLAGS) stest.o -o stest $(LIB) \
+		$(CC) $(CFLAGS) -fno-PIC $(LDFLAGS) stest.o -o stest $(LIB) \
 		$(X_LIBS) -lXt $(X_PRE_LIBS) -lXext -lX11 $(LIBS)
 
 # Smoke test: allows end-users to quickly discern basic usability
@@ -265,7 +288,7 @@
 	   else \
 		echo "Installing $$i" ; \
 		$(INSTALL_DATA) $$i $(LIB_INSTALL_DIR)/$$i ; \
-		chmod 555 $(LIB_INSTALL_DIR)/$$i; \
+		chmod 755 $(LIB_INSTALL_DIR)/$$i; \
 	   fi; \
 	   done;)
 
@@ -274,7 +297,7 @@
 	    do \
 	    if [ ! -d $$i ] ; then \
 		echo "Making directory $$i"; \
-		mkdir $$i; \
+		mkdir -p $$i; \
 		chmod 755 $$i; \
 		else true; \
 		fi; \
@@ -282,7 +305,7 @@
 	@echo "Installing $(LIB)";
 	@$(INSTALL_DATA) $(LIB) $(LIB_INSTALL_DIR)/$(LIB);
 	@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(LIB));
-	@chmod 555 $(LIB_INSTALL_DIR)/$(LIB);
+	@chmod 755 $(LIB_INSTALL_DIR)/$(LIB);
 	@echo "Installing xpa.h"
 	@$(INSTALL_DATA) xpa.h $(INCLUDE_INSTALL_DIR)/xpa.h
 	@echo "Installing prsetup.h"
@@ -296,7 +319,7 @@
 install-man:
 	@if [ ! -d $(MAN_INSTALL_DIR) ] ; then \
 	    echo "Making directory $(MAN_INSTALL_DIR)"; \
-	    mkdir $(MAN_INSTALL_DIR); \
+	    mkdir -p $(MAN_INSTALL_DIR); \
 	    chmod 755 $(MAN_INSTALL_DIR); \
 	    else true; \
 	fi;
@@ -307,7 +330,7 @@
 		M="$(MAN_INSTALL_DIR)/man$$E"; \
 		if [ ! -d $$M ] ; then \
 		    echo "Making directory $$M"; \
-		    mkdir $$M; \
+		    mkdir -p $$M; \
 		    chmod 755 $$M; \
 		    else true; \
 		fi; \