Re: [PATCH] Improve make rpm to work properly

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Looks good to me, Reviewed..

On 01/06/2012 04:28 PM, Steven Dake wrote:
> Signed-off-by: Steven Dake <sdake@xxxxxxxxxx>
> ---
>  Makefile.am |    8 ++++++--
>  1 files changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/Makefile.am b/Makefile.am
> index 0a1d033..eb8b875 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -181,7 +181,7 @@ srpm: clean
>  	$(MAKE) $(SPEC) $(TARFILE)
>  	rpmbuild $(RPMBUILDOPTS) --nodeps -bs $(SPEC)
>  
> -rpm: clean
> +rpm: clean _version
>  	$(MAKE) $(SPEC) $(TARFILE)
>  	rpmbuild $(RPMBUILDOPTS) -ba $(SPEC)
>  
> @@ -194,7 +194,7 @@ dist-hook: gen-ChangeLog
>  	echo $(VERSION) > $(distdir)/.tarball-version
>  
>  gen_start_date = 2000-01-01
> -.PHONY: gen-ChangeLog
> +.PHONY: gen-ChangeLog _version
>  gen-ChangeLog:
>  	if test -d .git; then						\
>  		LC_ALL=C $(top_srcdir)/build-aux/gitlog-to-changelog		\
> @@ -202,3 +202,7 @@ gen-ChangeLog:
>  		rm -f $(distdir)/ChangeLog;				\
>  		mv $(distdir)/cl-t $(distdir)/ChangeLog;		\
>  	fi
> +
> +_version:
> +	cd $(srcdir) && rm -rf autom4te.cache .version && autoreconf -i
> +	$(MAKE) $(AM_MAKEFLAGS) Makefile

_______________________________________________
discuss mailing list
discuss@xxxxxxxxxxxx
http://lists.corosync.org/mailman/listinfo/discuss


[Index of Archives]     [Linux Clusters]     [Corosync Project]     [Linux USB Devel]     [Linux Audio Users]     [Photo]     [Yosemite News]    [Yosemite Photos]    [Linux Kernel]     [Linux SCSI]     [X.Org]

  Powered by Linux