From: ayin <ayin>
Date: Fri, 8 Dec 2006 22:18:36 +0000 (+0000)
Subject: Fixes for srcdir != builddir.
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=61d9f8171cd64646db345568962b3b9906bb3515;p=dana%2Furxvt.git

Fixes for srcdir != builddir.
---

diff --git a/doc/Makefile.in b/doc/Makefile.in
index cabaca21..92d3d0b7 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -95,19 +95,19 @@ distclean:
 
 install:
 	$(INSTALL) -d $(DESTDIR)$(man1dir)
-	$(SED) $(SEDREPLACE) < rxvt.1.man.in >rxvt.1.man
+	$(SED) $(SEDREPLACE) < $(srcdir)/rxvt.1.man.in >rxvt.1.man
 	$(INSTALL_DATA) rxvt.1.man $(DESTDIR)$(man1dir)/$(RXVTNAME).$(man1ext)
-	$(SED) $(SEDREPLACE) < rxvtc.1.man.in >rxvtc.1.man
+	$(SED) $(SEDREPLACE) < $(srcdir)/rxvtc.1.man.in >rxvtc.1.man
 	$(INSTALL_DATA) rxvtc.1.man $(DESTDIR)$(man1dir)/$(RXVTNAME)c.$(man1ext)
-	$(SED) $(SEDREPLACE) < rxvtd.1.man.in >rxvtd.1.man
+	$(SED) $(SEDREPLACE) < $(srcdir)/rxvtd.1.man.in >rxvtd.1.man
 	$(INSTALL_DATA) rxvtd.1.man $(DESTDIR)$(man1dir)/$(RXVTNAME)d.$(man1ext)
 	$(INSTALL) -d $(DESTDIR)$(man7dir)
-	$(SED) $(SEDREPLACE) < rxvt.7.man.in >rxvt.7.man
+	$(SED) $(SEDREPLACE) < $(srcdir)/rxvt.7.man.in >rxvt.7.man
 	$(INSTALL_DATA) rxvt.7.man $(DESTDIR)$(man7dir)/$(RXVTNAME).$(man7ext)
 @IF_PERL@	$(INSTALL) -d $(DESTDIR)$(man3dir)
-@IF_PERL@	$(SED) $(SEDREPLACE) < rxvtperl.3.man.in >rxvtperl.3.man
+@IF_PERL@	$(SED) $(SEDREPLACE) < $(srcdir)/rxvtperl.3.man.in >rxvtperl.3.man
 @IF_PERL@	$(INSTALL_DATA) rxvtperl.3.man $(DESTDIR)$(man3dir)/$(RXVTNAME)perl.$(man3ext)
-	if test -x "@TIC@"; then if test -n "@TIC@"; then @TIC@ etc/rxvt-unicode.terminfo; fi; fi
+	if test -x "@TIC@"; then if test -n "@TIC@"; then @TIC@ $(srcdir)/etc/rxvt-unicode.terminfo; fi; fi
 
 uninstall:
 	-(cd $(mandir); rm -f $(RXVTNAME).$(manext) )
diff --git a/src/Makefile.in b/src/Makefile.in
index 07953a07..3eb5caf8 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -125,7 +125,7 @@ install-perl:
 @IF_PERL@	$(INSTALL) -d $(DESTDIR)$(libdir)/urxvt
 @IF_PERL@	$(INSTALL) -d $(DESTDIR)$(libdir)/urxvt/perl
 @IF_PERL@	$(INSTALL_DATA) urxvt.pm $(DESTDIR)$(libdir)/urxvt/urxvt.pm
-@IF_PERL@	for ext in perl/*; do test -f "$$ext" && $(INSTALL_DATA) "$$ext" $(DESTDIR)$(libdir)/urxvt/"$$ext"; done
+@IF_PERL@	for ext in $(srcdir)/perl/*; do test -f "$$ext" && $(INSTALL_DATA) "$$ext" $(DESTDIR)$(libdir)/urxvt/perl/"`basename "$$ext"`"; done
 
 install: allbin alldoc install-perl
 	$(INSTALL) -d $(DESTDIR)$(bindir)
@@ -138,7 +138,7 @@ perlxsi.c: Makefile
 
 rxvtperl.C: rxvtperl.xs typemap
 	#$(PERL) @PERLPRIVLIBEXP@/ExtUtils/xsubpp -csuffix .C -C++ -typemap @PERLPRIVLIBEXP@/ExtUtils/typemap -typemap typemap -prototypes rxvtperl.xs >$@
-	$(PERL) @PERLPRIVLIBEXP@/ExtUtils/xsubpp -C++ -typemap @PERLPRIVLIBEXP@/ExtUtils/typemap -typemap typemap -prototypes rxvtperl.xs >$@
+	$(PERL) @PERLPRIVLIBEXP@/ExtUtils/xsubpp -C++ -typemap @PERLPRIVLIBEXP@/ExtUtils/typemap -typemap $(srcdir)/typemap -prototypes $(srcdir)/rxvtperl.xs >$@
 
 rxvtperl.o: rxvtperl.C perlxsi.c
 	$(COMPILE) @PERLFLAGS@ -DLIBDIR="\"$(libdir)/urxvt\"" -c $<