diff options
| author | Michael E Brown <mebrown@michaels-house.net> | 2007-12-04 00:38:47 -0600 |
|---|---|---|
| committer | Michael E Brown <mebrown@michaels-house.net> | 2007-12-04 00:38:47 -0600 |
| commit | 613adbb0c28685b8aec3689eafc4e14dd10cabda (patch) | |
| tree | e79baea1860f34af606109a8615d55921d994bb3 | |
| parent | 1e4847aab547ca88227315133fc4b1996209e53c (diff) | |
| download | mock-613adbb0c28685b8aec3689eafc4e14dd10cabda.tar.gz mock-613adbb0c28685b8aec3689eafc4e14dd10cabda.tar.xz mock-613adbb0c28685b8aec3689eafc4e14dd10cabda.zip | |
merge conflicts.mock-0.8.13
| -rw-r--r-- | Makefile.am | 11 | ||||
| -rw-r--r-- | Makefile.in | 11 | ||||
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | configure.ac | 2 |
4 files changed, 14 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am index 1532a97..e4ab2cd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -62,11 +62,12 @@ REPLACE_VARS_ON_INSTALL=$(libexecdir)/mock.py install-exec-hook: for i in $(REPLACE_VARS_ON_INSTALL); do \ file=$(DESTDIR)/$$i ;\ - perl -p -i -e 's|^__VERSION__=.*|__VERSION__="$(RELEASE_VERSION)"|' $$file ;\ - perl -p -i -e 's|^SYSCONFDIR=.*|SYSCONFDIR="$(sysconfdir)"|' $$file ;\ - perl -p -i -e 's|^PYTHONDIR=.*|PYTHONDIR="$(pythondir)"|' $$file ;\ - perl -p -i -e 's|^PKGPYTHONDIR=.*|PKGPYTHONDIR="$(pkgpythondir)"|' $$file ;\ - perl -p -i -e 's|^PKGDATADIR=.*|PKGDATADIR="$(pkgdatadir)"|' $$file ;\ + perl -p -i -e 's|^__VERSION__ =.*|__VERSION__="$(RELEASE_VERSION)"|' $$file ;\ + perl -p -i -e 's|^SYSCONFDIR =.*|SYSCONFDIR="$(sysconfdir)"|' $$file ;\ + perl -p -i -e 's|^PYTHONDIR =.*|PYTHONDIR="$(pythondir)"|' $$file ;\ + perl -p -i -e 's|^PKGPYTHONDIR =.*|PKGPYTHONDIR="$(pkgpythondir)"|' $$file ;\ + perl -p -i -e 's|^PKGDATADIR =.*|PKGDATADIR="$(pkgdatadir)"|' $$file ;\ + perl -p -i -e 's|^LIBDIR =.*|PKGDATADIR="$(libdir)"|' $$file ;\ done .PHONY: rpm srpm diff --git a/Makefile.in b/Makefile.in index 70febdb..7d71d2a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -982,11 +982,12 @@ uninstall-man: uninstall-man1 install-exec-hook: for i in $(REPLACE_VARS_ON_INSTALL); do \ file=$(DESTDIR)/$$i ;\ - perl -p -i -e 's|^__VERSION__=.*|__VERSION__="$(RELEASE_VERSION)"|' $$file ;\ - perl -p -i -e 's|^SYSCONFDIR=.*|SYSCONFDIR="$(sysconfdir)"|' $$file ;\ - perl -p -i -e 's|^PYTHONDIR=.*|PYTHONDIR="$(pythondir)"|' $$file ;\ - perl -p -i -e 's|^PKGPYTHONDIR=.*|PKGPYTHONDIR="$(pkgpythondir)"|' $$file ;\ - perl -p -i -e 's|^PKGDATADIR=.*|PKGDATADIR="$(pkgdatadir)"|' $$file ;\ + perl -p -i -e 's|^__VERSION__ =.*|__VERSION__="$(RELEASE_VERSION)"|' $$file ;\ + perl -p -i -e 's|^SYSCONFDIR =.*|SYSCONFDIR="$(sysconfdir)"|' $$file ;\ + perl -p -i -e 's|^PYTHONDIR =.*|PYTHONDIR="$(pythondir)"|' $$file ;\ + perl -p -i -e 's|^PKGPYTHONDIR =.*|PKGPYTHONDIR="$(pkgpythondir)"|' $$file ;\ + perl -p -i -e 's|^PKGDATADIR =.*|PKGDATADIR="$(pkgdatadir)"|' $$file ;\ + perl -p -i -e 's|^LIBDIR =.*|PKGDATADIR="$(libdir)"|' $$file ;\ done .PHONY: rpm srpm @@ -1949,7 +1949,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu temp_RELEASE_NAME=mock temp_RELEASE_MAJOR=0 temp_RELEASE_MINOR=8 -temp_RELEASE_SUBLEVEL=12 +temp_RELEASE_SUBLEVEL=13 temp_RELEASE_EXTRALEVEL= #################################### diff --git a/configure.ac b/configure.ac index 2cc1b32..08a99ca 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ AC_INIT([mock],[0.8.12]) temp_RELEASE_NAME=mock temp_RELEASE_MAJOR=0 temp_RELEASE_MINOR=8 -temp_RELEASE_SUBLEVEL=12 +temp_RELEASE_SUBLEVEL=13 temp_RELEASE_EXTRALEVEL= #################################### |