RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Ralf S. Engelschall
  Root:   /v/rpm/cvs                       Email:  r...@rpm5.org
  Module: rpm                              Date:   13-Apr-2009 17:33:59
  Branch: rpm-5_1                          Handle: 2009041315335900

  Modified files:           (Branch: rpm-5_1)
    rpm/misc                Makefile.am

  Log:
    except in 5.1.7 we always built with this override definition, so
    resurrect it. I currently don't know why it was necessary, but I'm
    sure it was because of library cross-dependencies

  Summary:
    Revision    Changes     Path
    1.32.4.11   +2  -2      rpm/misc/Makefile.am
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/misc/Makefile.am
  ============================================================================
  $ cvs diff -u -r1.32.4.10 -r1.32.4.11 Makefile.am
  --- rpm/misc/Makefile.am      13 Apr 2009 10:22:32 -0000      1.32.4.10
  +++ rpm/misc/Makefile.am      13 Apr 2009 15:33:59 -0000      1.32.4.11
  @@ -55,8 +55,8 @@
   endif
   librpmmisc_la_DEPENDENCIES = \
        @ALLOCA@
  -#librpmmisc.la: $(librpmmisc_la_OBJECTS) $(librpmmisc_la_DEPENDENCIES) 
  -#    $(librpmmisc_la_LINK) -rpath $(usrlibdir) $(librpmmisc_la_OBJECTS) 
$(librpmmisc_la_LIBADD)
  +librpmmisc.la: $(librpmmisc_la_OBJECTS) $(librpmmisc_la_DEPENDENCIES) 
  +     $(librpmmisc_la_LINK) -rpath $(usrlibdir) $(librpmmisc_la_OBJECTS) 
$(librpmmisc_la_LIBADD)
   
   install-data-hook:
   if !ENABLE_BUILD_LAFILES
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                rpm-cvs@rpm5.org

Reply via email to