RPM Community Forums

Mailing List Message of <rpm-devel>

Re: [CVS] RPM: rpm-5_2: rpm/tools/ Makefile.am

From: Jeff Johnson <n3npq@mac.com>
Date: Thu 14 May 2009 - 21:06:15 CEST
Message-id: <F86C337E-F372-4CB3-8A55-A5D80E99522C@mac.com>
Thank you!

Meanwhile, you have the same code in both the TRUE and the FALSE
branches of an if ... then ... else ... clause afaict.

That "works", but perhaps there is simpler?

;-)

73 de Jeff

On May 14, 2009, at 3:02 PM, Per Øyvind Karlsen wrote:

>  RPM Package Manager, CVS Repository
>  http://rpm5.org/cvs/
>   
> ____________________________________________________________________________
>
>  Server: rpm5.org                         Name:   Per Øyvind Karlsen
>  Root:   /v/rpm/cvs                       Email:  pkarlsen@rpm5.org
>  Module: rpm                              Date:   14-May-2009 21:02:20
>  Branch: rpm-5_2                          Handle: 2009051419021900
>
>  Modified files:           (Branch: rpm-5_2)
>    rpm/tools               Makefile.am
>
>  Log:
>    make sure that the proper, required directory is created now that
>    tools are installed under a dedicated 'bin/' directory
>
>  Summary:
>    Revision    Changes     Path
>    2.120.2.2   +2  -1      rpm/tools/Makefile.am
>   
> ____________________________________________________________________________
>
>  patch -p0 <<'@@ .'
>  Index: rpm/tools/Makefile.am
>   
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
>  $ cvs diff -u -r2.120.2.1 -r2.120.2.2 Makefile.am
>  --- rpm/tools/Makefile.am	7 May 2009 18:57:52 -0000	2.120.2.1
>  +++ rpm/tools/Makefile.am	14 May 2009 19:02:19 -0000	2.120.2.2
>  @@ -154,7 +154,7 @@
>   install-data-local:
>   if WITH_DB_INTERNAL
>   if WITH_DB_TOOLS_INTEGRATED
>  -	@[ -d $(pkgbindir) ] || $(mkinstalldirs) $(pkgbindir)
>  +	@[ -d $(DESTDIR)$(pkgbindir) ] || $(mkinstalldirs) $(DESTDIR)$ 
> (pkgbindir)
>   	$(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $ 
> (pkgbinPROGRAMS_INSTALL) \
>   		$(builddir)/db_tool $(DESTDIR)$(pkgbindir)/db_tool
>   	for tool in . $(my_DB_TOOLS); do \
>  @@ -163,6 +163,7 @@
>   		ln $(DESTDIR)$(pkgbindir)/db_tool $(DESTDIR)$(pkgbindir)/$$tool; \
>   	done
>   else
>  +	@[ -d $(DESTDIR)$(pkgbindir) ] || $(mkinstalldirs) $(DESTDIR)$ 
> (pkgbindir)
>   	for tool in . $(my_DB_TOOLS); do \
>   		test ".$$tool" = .. && continue; \
>   		$(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $ 
> (pkgbinPROGRAMS_INSTALL) \
>  @@ .
> ______________________________________________________________________
> RPM Package Manager                                    http://rpm5.org
> CVS Sources Repository                                rpm-cvs@rpm5.org
Received on Thu May 14 21:06:50 2009
Driven by Jeff Johnson and the RPM project team.
Hosted by OpenPKG and Ralf S. Engelschall.
Powered by FreeBSD and OpenPKG.