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

  Server: rpm5.org                         Name:   Ralf S. Engelschall
  Root:   /v/rpm/cvs                       Email:  rse@rpm5.org
  Module: popt                             Date:   11-Nov-2007 18:17:04
  Branch: HEAD                             Handle: 2007111117170400

  Modified files:
    popt                    Makefile.am configure.ac

  Log:
    drop MARK64 hack also for POPT (similar to what we have already done
    for RPM itself) as it isn't our business to decide for lib64 -- for
    this there is Autoconf option --libdir the packager should use himself

  Summary:
    Revision    Changes     Path
    1.43        +1  -1      popt/Makefile.am
    1.32        +0  -9      popt/configure.ac
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: popt/Makefile.am
  ============================================================================
  $ cvs diff -u -r1.42 -r1.43 Makefile.am
  --- popt/Makefile.am	15 Jul 2007 02:00:28 -0000	1.42
  +++ popt/Makefile.am	11 Nov 2007 17:17:04 -0000	1.43
  @@ -35,7 +35,7 @@
   
   include_HEADERS = popt.h
   
  -usrlibdir = $(libdir)@MARK64@
  +usrlibdir = $(libdir)
   usrlib_LTLIBRARIES = libpopt.la
   
   libpopt_la_SOURCES = popt.c findme.c poptparse.c poptconfig.c popthelp.c poptint.c
  @@ .
  patch -p0 <<'@@ .'
  Index: popt/configure.ac
  ============================================================================
  $ cvs diff -u -r1.31 -r1.32 configure.ac
  --- popt/configure.ac	4 Nov 2007 13:48:45 -0000	1.31
  +++ popt/configure.ac	11 Nov 2007 17:17:04 -0000	1.32
  @@ -59,15 +59,6 @@
   fi
   AC_SUBST(TARGET)
   
  -dnl XXX Choose /usr/lib or /usr/lib64 for library installs.
  -MARK64=
  -if ! echo "${libdir}" | grep -q '64$' ; then
  -    case "${target_cpu}" in
  -    x86_64*|powerpc64*|ppc64*|sparc64*|s390x*) MARK64=64 ;;
  -    esac
  -fi
  -AC_SUBST(MARK64)
  -
   AC_CHECK_HEADERS(float.h libintl.h mcheck.h unistd.h langinfo.h)
   
   # For some systems we know that we have ld_version scripts.
  @@ .