shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-02 01:18:26 +03:00
Code Releases Activity

makefiles: use fullpath when in assign

Browse Source 
We need to put full path right in the assign moment,
otherwise command:

make rpm rpmbuild=/my/tmp/dir

cannot work as one would have expected.
This commit is contained in:
Zdenek Kabelac 2015-05-13 15:43:55 +02:00
parent 7bd1559db6
commit a8fc483ca4
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.in
View File

@ -93,6 +93,7 @@ cscope.out:
all: cscope.out all: cscope.out
endif endif
DISTCLEAN_TARGETS += cscope.out DISTCLEAN_TARGETS += cscope.out
CLEAN_DIRS += autom4te.cache
check check_system check_cluster check_local check_lvmetad unit: all check check_system check_cluster check_local check_lvmetad unit: all
$(MAKE) -C test $(@) $(MAKE) -C test $(@)
@ -125,7 +126,7 @@ rpm: dist
-e "s,^\(Version:[^0-9%]*\)[0-9.]*$$,\1 $(LVM_VER)," \ -e "s,^\(Version:[^0-9%]*\)[0-9.]*$$,\1 $(LVM_VER)," \
-e "s,^\(Release:[^0-9%]*\)[0-9.]\+,\1 $$GIT_VER," \ -e "s,^\(Release:[^0-9%]*\)[0-9.]\+,\1 $$GIT_VER," \
$(top_srcdir)/spec/source.inc >$(rpmbuilddir)/SOURCES/source.inc $(top_srcdir)/spec/source.inc >$(rpmbuilddir)/SOURCES/source.inc
rpmbuild -v --define "_topdir $(abs_top_builddir)/$(rpmbuilddir)" -ba $(top_srcdir)/spec/lvm2.spec rpmbuild -v --define "_topdir $(rpmbuilddir)" -ba $(top_srcdir)/spec/lvm2.spec
generate: conf.generate generate: conf.generate
$(MAKE) -C conf generate $(MAKE) -C conf generate

2
make.tmpl.in
View File

@ -116,7 +116,7 @@ vpath %.exported_symbols $(srcdir)
interface = @interface@ interface = @interface@
interfacebuilddir = $(top_builddir)/libdm/$(interface) interfacebuilddir = $(top_builddir)/libdm/$(interface)
rpmbuilddir = build rpmbuilddir = $(abs_top_builddir)/build
# The number of jobs to run, if blank, defaults to the make standard # The number of jobs to run, if blank, defaults to the make standard
ifndef MAKEFLAGS ifndef MAKEFLAGS