small fixes, also change x11usrlibdir

diff --git a/Changes b/Changes
index 23cdfa48413346e31ac932f7ce5929d7324b2ae9..513163aa52a234fca63eceb2eddc8b4e1f7de9c2 100644 (file)
--- a/Changes
+++ b/Changes
@@ -29,6 +29,8 @@ DUMB: support tex fonts
           (patch by Philip Paeps).
         - add binding for backspace in iso14755 5.1 to remove the last
           digit.
+        - go with the times and expect x11 library files in /usr/lib, not
+          /usr/X11R6/lib.
 
 8.2  Sat Feb 17 21:35:28 CET 2007
        - fix make depend in src/, reported by exg.

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 92d3d0b74b325b7314ff5b674acbc1faae7f98ca..7fcb6dd4ca0f669b68b1dc6ad164597a15d2931d 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -48,7 +48,7 @@ rxvtperl.3.pod: ../src/urxvt.pm
        $(CP) $< $@
 
 %.tbl: %.pod
-       ./podtbl <$< >$@
+       $(srcdir)/podtbl <$< >$@
 
 %.1.man.in: %.1.tbl
        pod2man -n @@RXVT_NAME@@ -r"$(VERSION)" -q\" -s1 -c "RXVT-UNICODE" <$< >$@
@@ -77,7 +77,7 @@ alldoc:       rxvt.1.man.in rxvt.7.man.in rxvtc.1.man.in rxvtd.1.man.in rxvtperl.3.man
        rxvt.1.txt    rxvt.7.txt    rxvtc.1.txt    rxvtd.1.txt    rxvtperl.3.txt \
        rxvt.1.html   rxvt.7.html   rxvtc.1.html   rxvtd.1.html   rxvtperl.3.html \
        ../README.configure ../README.FAQ
-       infocmp -C rxvt-unicode >etc/rxvt-unicode.termcap
+       infocmp -C rxvt-unicode >$(srcdir)/etc/rxvt-unicode.termcap
 
 clean:
        rm -f *~

diff --git a/src/Makefile.in b/src/Makefile.in
index 361a8a4ee55db26568a1d3ad3e1149c423520b7e..8e5ed74b3fc0947aeb18f2a29eeb4d2d43559ef8 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -61,7 +61,7 @@ RXVTD_BINNAME=$(DESTDIR)$(bindir)/$(RXVT_BASENAME)d$(EXEEXT)
 # Distribution variables
 #
 
-.SUFFIXES:     .C .o
+.SUFFIXES:     .C .c .o
 
 #-------------------------------------------------------------------------
 # inference rules

diff --git a/src/feature.h b/src/feature.h
index d1dd21f0085427191e089df1cc6a86596238e836..ba1d2b9ed6c18385f84bad8ffb9fedad674de1b8 100644 (file)
--- a/src/feature.h
+++ b/src/feature.h
@@ -24,7 +24,7 @@
 #define FEATURE_H
 
 #ifndef X11USRLIBDIR
-# define X11USRLIBDIR          "/usr/X11R6/lib"
+# define X11USRLIBDIR          "/usr/lib"
 #endif
 #ifndef X11LIBDIR
 # define X11LIBDIR             X11USRLIBDIR "/X11"