Eliminate rpmpopt.

Let rpmpopt-${VERSION} be generated by configure.ac directly.

diff --git a/Makefile.am b/Makefile.am
index d0c6e27..c52eb58 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@ LINT = splint
 EXTRA_DIST = CHANGES ChangeLog CREDITS Doxyheader GROUPS INSTALL \
        autodeps autogen.sh \
        config.site db db3/configure installplatform platform* \
-       rpm.magic rpmpopt-$(VERSION)
+       rpm.magic
 
 SUBDIRS = po misc @WITH_DB_SUBDIR@ lua rpmio rpmdb lib build python tools scripts doc . tests
 
@@ -35,9 +35,6 @@ pkglib_DATA =         rpmrc rpmpopt-$(VERSION) macros
 pkglib_SCRIPTS =       find-provides find-requires mkinstalldirs \
                        config.guess config.sub config.site
 
-rpmpopt-$(VERSION): rpmpopt
-       cp rpmpopt $@
-
 rpm_SOURCES =          rpmqv.c debug.h system.h
 rpm_CPPFLAGS =         $(AM_CPPFLAGS) -DIAM_RPMDB -DIAM_RPMEIU -DIAM_RPMK -DIAM_RPMQV
 rpm_LDFLAGS =          @WITH_LIBELF_LIB@ @WITH_BEECRYPT_LIB@
@@ -168,7 +165,7 @@ uninstall-local:
 distclean-local:
        @rm -rf Doxytags apidocs 
        @rm -f stamp-h.in db3/*.orig db3/db3lobjs
-       @rm -f ChangeLog rpmpopt-$(VERSION)
+       @rm -f ChangeLog
 
 .PHONY:        setperms
 setperms:

diff --git a/configure.ac b/configure.ac
index cbfaa93..c3a0f8e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1197,7 +1197,7 @@ AC_CONFIG_SUBDIRS(db3)
 
 AC_PATH_PROG(AUTOM4TE,autom4te,:)
 
-AC_CONFIG_FILES([ Doxyfile Makefile rpmrc macros platform rpm.pc rpmpopt
+AC_CONFIG_FILES([ Doxyfile Makefile rpmrc macros platform rpm.pc
        rpmio/Makefile rpmdb/Makefile lib/Makefile build/Makefile
        po/Makefile.in scripts/Makefile scripts/brp-redhat
        scripts/macros.perl scripts/macros.php scripts/macros.python
@@ -1215,6 +1215,7 @@ AC_CONFIG_FILES([ Doxyfile Makefile rpmrc macros platform rpm.pc rpmpopt
        lua/Makefile
        tests/Makefile
   ])
+AC_CONFIG_FILES([rpmpopt-${VERSION}:rpmpopt.in],,[VERSION=${VERSION}])
 AC_CONFIG_COMMANDS([default],[[        
        echo timestamp > stamp-h.in