From ea757121c0710fe6fed14409c9d334f7f5e37efd Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Fri, 8 Aug 2008 16:20:05 +0200 Subject: Refer to srcdir spec file Makefile so make rpm works when builddir != srcdir. --- ChangeLog | 6 ++++++ Makefile.am | 2 +- Makefile.in | 2 +- doc/Makefile.in | 4 ++-- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 12683fa4..58def2e3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-08-08 Mark Wielaard + + * Makefile.am (rpm): Refer to srcdir spec file so make rpm works in + builddir. + * Makefile.in: Regenerated. + 2008-08-08 Mark Wielaard * systemtap.spec: Disable chmodding of samples/kmalloc-top. diff --git a/Makefile.am b/Makefile.am index 154d9944..96ebc329 100644 --- a/Makefile.am +++ b/Makefile.am @@ -283,4 +283,4 @@ installcheck: fi rpm: systemtap.spec dist - rpmbuild --define "_sourcedir $(PWD)/" -ba systemtap.spec + rpmbuild --define "_sourcedir $(PWD)/" -ba $(srcdir)/systemtap.spec diff --git a/Makefile.in b/Makefile.in index 45d209ac..ee7e2758 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1672,7 +1672,7 @@ installcheck: fi rpm: systemtap.spec dist - rpmbuild --define "_sourcedir $(PWD)/" -ba systemtap.spec + rpmbuild --define "_sourcedir $(PWD)/" -ba $(srcdir)/systemtap.spec # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/doc/Makefile.in b/doc/Makefile.in index 6464afc3..e01c5ebf 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -- cgit