diff options
| author | Michael E Brown <michael_e_brown@dell.com> | 2007-10-18 17:13:25 -0500 |
|---|---|---|
| committer | Michael E Brown <michael_e_brown@dell.com> | 2007-10-18 17:13:25 -0500 |
| commit | 9d4e909bdb995734fb80a074cbfee90b1d0f2dee (patch) | |
| tree | cfdda790d4b5004a5a0b13de02c2a51b581707da | |
| parent | d192f37690f9a2b97ff7f04cf79116b7c47deac4 (diff) | |
separate out src/mock.py dep on itself so builds where srcdir==builddir will work properly.
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | Makefile.in | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index 36bf7a4..e4ff498 100644 --- a/Makefile.am +++ b/Makefile.am @@ -50,7 +50,9 @@ pkgpython_PYTHON = \ src/py-libs/trace_decorator.py \ src/py-libs/uid.py -src/mock.py: configure.ac Makefile.am src/mock.py +$(top_builddir)/src/mock.py: $(top_srcdir)/src/mock.py + +src/mock.py: configure.ac Makefile.am echo Updating $@, current pwd: $$(pwd) cp -f $(top_srcdir)/$@ $(top_builddir)/$@.new perl -p -i -e 's|^__VERSION__=.*|__VERSION__="$(RELEASE_VERSION)"|' $(top_builddir)/$@.new diff --git a/Makefile.in b/Makefile.in index 25ec327..13461e1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -251,9 +251,6 @@ RELEASE_STRING = $(RELEASE_NAME)-$(RELEASE_VERSION) MOCK_LIBTOOL_CURRENT = @MOCK_LIBTOOL_CURRENT@ MOCK_LIBTOOL_REVISION = @MOCK_LIBTOOL_REVISION@ MOCK_LIBTOOL_AGE = @MOCK_LIBTOOL_AGE@ - -#$(bin_PROGRAMS): src/libselinux-mock.la -#$(EXTRA_PROGRAMS): src/libselinux-mock.la CLEANFILES = mock-*.tar.gz mock-*.tar.bz2 mock-*.rpm _buildtemp \ version $(EXTRA_PROGRAMS) DISTCLEANFILES = *~ @@ -923,7 +920,9 @@ uninstall-man: uninstall-man1 uninstall-pkgpythonPYTHON -src/mock.py: configure.ac Makefile.am src/mock.py +$(top_builddir)/src/mock.py: $(top_srcdir)/src/mock.py + +src/mock.py: configure.ac Makefile.am echo Updating $@, current pwd: $$(pwd) cp -f $(top_srcdir)/$@ $(top_builddir)/$@.new perl -p -i -e 's|^__VERSION__=.*|__VERSION__="$(RELEASE_VERSION)"|' $(top_builddir)/$@.new |