diff options
| author | Michael E Brown <michael_e_brown@dell.com> | 2007-10-08 15:33:21 -0500 |
|---|---|---|
| committer | Michael E Brown <michael_e_brown@dell.com> | 2007-10-08 15:33:21 -0500 |
| commit | f9b58106c9c0dd529cbe0841e5a4ffa3b7e4fee4 (patch) | |
| tree | 23616c35550e1705c7aa15d0c748375e8a744c49 | |
| parent | c49b26dec9753b90221bb2be12a946fe406b7be4 (diff) | |
| download | mock-f9b58106c9c0dd529cbe0841e5a4ffa3b7e4fee4.tar.gz mock-f9b58106c9c0dd529cbe0841e5a4ffa3b7e4fee4.tar.xz mock-f9b58106c9c0dd529cbe0841e5a4ffa3b7e4fee4.zip | |
more autotools updates.
| -rw-r--r-- | Makefile.am | 7 | ||||
| -rw-r--r-- | Makefile.in | 7 | ||||
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | mock.spec.in | 10 |
4 files changed, 18 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am index 69c289f..9c7ec57 100644 --- a/Makefile.am +++ b/Makefile.am @@ -30,7 +30,7 @@ $(bin_PROGRAMS): src/libselinux-mock.la $(EXTRA_PROGRAMS): src/libselinux-mock.la CLEANFILES += $(EXTRA_PROGRAMS) -AM_CPPFLAGS = +AM_CPPFLAGS = -I$(top_builddir)/src -I$(top_srcdir)/src lib_LTLIBRARIES = src/libselinux-mock.la src_libselinux_mock_la_LDFLAGS = -version-info $(MOCK_LIBTOOL_CURRENT):$(MOCK_LIBTOOL_REVISION):$(MOCK_LIBTOOL_AGE) @@ -41,6 +41,7 @@ bin_PROGRAMS += src/mock src_mock_SOURCES = src/mock.c src_mock_LDFLAGS = +dist: src/mock.py src/mock.py: configure.ac @echo Updating $@ @cp -f $@ $@.new @@ -48,6 +49,9 @@ src/mock.py: configure.ac @diff -q $@ $@.new >/dev/null 2>&1 || mv -f $@.new $@ @rm -f $@.new +EXTRA_DIST += etc docs + + rpm: dist BLD_DIR=$$(mktemp -d /tmp/rpmbuild-$$$$-XXXXXX); \ mkdir -p $$BLD_DIR/SOURCES $$BLD_DIR/BUILD $$BLD_DIR/RPMS $$BLD_DIR/RPMS/i386 $$BLD_DIR/RPMS/noarch $$BLD_DIR/SRPMS $$BLD_DIR/SPECS ;\ @@ -64,4 +68,3 @@ srpm: dist cp $$BLD_DIR/SRPMS/*rpm . ;\ rm -rf $$BLD_DIR -#EXTRA_DIST += diff --git a/Makefile.in b/Makefile.in index 7d91e43..2a79ffd 100644 --- a/Makefile.in +++ b/Makefile.in @@ -240,8 +240,8 @@ MOCK_LIBTOOL_AGE = @MOCK_LIBTOOL_AGE@ CLEANFILES = mock-*.tar.gz mock-*.tar.bz2 mock-*.rpm _buildtemp \ version $(EXTRA_PROGRAMS) DISTCLEANFILES = *~ -EXTRA_DIST = -AM_CPPFLAGS = +EXTRA_DIST = etc docs +AM_CPPFLAGS = -I$(top_builddir)/src -I$(top_srcdir)/src lib_LTLIBRARIES = src/libselinux-mock.la src_libselinux_mock_la_LDFLAGS = -version-info $(MOCK_LIBTOOL_CURRENT):$(MOCK_LIBTOOL_REVISION):$(MOCK_LIBTOOL_AGE) src_libselinux_mock_la_CFLAGS = @@ -811,6 +811,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-libLTLIBRARIES $(bin_PROGRAMS): src/libselinux-mock.la $(EXTRA_PROGRAMS): src/libselinux-mock.la +dist: src/mock.py src/mock.py: configure.ac @echo Updating $@ @cp -f $@ $@.new @@ -832,8 +833,6 @@ srpm: dist rpmbuild --define "_topdir $$BLD_DIR" -ts --nodeps $(RELEASE_STRING).tar.gz ;\ cp $$BLD_DIR/SRPMS/*rpm . ;\ rm -rf $$BLD_DIR - -#EXTRA_DIST += # 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: @@ -1938,7 +1938,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu temp_RELEASE_NAME=mock temp_RELEASE_MAJOR=0 temp_RELEASE_MINOR=8 -temp_RELEASE_SUBLEVEL=8 +temp_RELEASE_SUBLEVEL=0 temp_RELEASE_EXTRALEVEL= #################################### diff --git a/mock.spec.in b/mock.spec.in index f3282c0..f686e70 100644 --- a/mock.spec.in +++ b/mock.spec.in @@ -1,6 +1,14 @@ +# these are all substituted by autoconf +%define major @RELEASE_MAJOR@ +%define minor @RELEASE_MINOR@ +%define sub @RELEASE_SUBLEVEL@ +%define extralevel @RELEASE_RPM_EXTRALEVEL@ +%define release_name mock +%define release_version %{major}.%{minor}.%{sub}%{extralevel} + Summary: Builds packages inside chroots Name: mock -Version: 0.7.6 +Version: %{release_version} Release: 1%{?dist} License: GPL Group: Development/Tools |