diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2010-11-17 15:33:30 +0200 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2010-11-17 15:38:01 +0200 |
| commit | 319a04d74ace9bffc0042e13497b257cfd7a5d46 (patch) | |
| tree | 6e58314b61628e2f09d9261d31f113391031f6b7 /Makefile.am | |
| parent | c43440f16b83ef53c8f4adff44de70925c19d266 (diff) | |
| download | rpm-319a04d74ace9bffc0042e13497b257cfd7a5d46.tar.gz rpm-319a04d74ace9bffc0042e13497b257cfd7a5d46.tar.bz2 rpm-319a04d74ace9bffc0042e13497b257cfd7a5d46.zip | |
Revert rpmquery/rpmverify split, ain't gonna happen this time around
- Dealing with the inevitable fallout and popt-foo needs more time
to handle, revert to the rpm 4.6-4.8 setup where rpmquery and rpmverify
are just symlinks to /bin/rpm, allowing especially query aliases
to work. Releasing an intermediate version where 'rpmquery --requires'
and the like dont work would do nothing but hurt the future intention
of splitting these things up for real.
- This effectively reverts commit 26125015e4321765582dce0b76f83530e7604d4e
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/Makefile.am b/Makefile.am index feffc0e63..d5be4986b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -88,8 +88,7 @@ pkginclude_HEADERS += build/rpmspec.h rpmbindir = `echo $(bindir) | $(SED) -e s,usr/bin,bin,` rpmbin_PROGRAMS = rpm -bin_PROGRAMS = rpm2cpio rpmbuild rpmdb rpmkeys rpmsign rpmspec \ - rpmverify rpmquery +bin_PROGRAMS = rpm2cpio rpmbuild rpmdb rpmkeys rpmsign rpmspec rpmlibexec_PROGRAMS = rpmconfig_SCRIPTS = find-provides find-requires mkinstalldirs \ @@ -109,18 +108,6 @@ rpm_LDADD = libcliutils.la rpm_LDADD += lib/librpm.la rpmio/librpmio.la rpm_LDADD += @WITH_NSS_LIB@ @WITH_POPT_LIB@ @WITH_ZLIB_LIB@ -rpmquery_SOURCES = rpmqv.c debug.h system.h -rpmquery_CPPFLAGS = $(AM_CPPFLAGS) -DIAM_RPMQ -rpmquery_LDADD = libcliutils.la -rpmquery_LDADD += lib/librpm.la rpmio/librpmio.la -rpmquery_LDADD += @WITH_NSS_LIB@ @WITH_POPT_LIB@ @WITH_ZLIB_LIB@ - -rpmverify_SOURCES = rpmqv.c debug.h system.h -rpmverify_CPPFLAGS = $(AM_CPPFLAGS) -DIAM_RPMV -rpmverify_LDADD = libcliutils.la -rpmverify_LDADD += lib/librpm.la rpmio/librpmio.la -rpmverify_LDADD += @WITH_NSS_LIB@ @WITH_POPT_LIB@ @WITH_ZLIB_LIB@ - rpmdb_SOURCES = rpmdb.c debug.h system.h rpmdb_CPPFLAGS = $(AM_CPPFLAGS) rpmdb_LDADD = libcliutils.la @@ -234,6 +221,12 @@ usrsrcdir = $(prefix)/src rpmvardir = $(localstatedir)/lib/rpm rpmvar_DATA = +install-exec-hook: + @rm -f $(DESTDIR)$(bindir)/rpmquery + @LN_S@ ../../bin/rpm $(DESTDIR)$(bindir)/rpmquery + @rm -f $(DESTDIR)$(bindir)/rpmverify + @LN_S@ ../../bin/rpm $(DESTDIR)$(bindir)/rpmverify + install-data-local: @case "@host_os@" in \ solaris*|linux*|darwin*) \ @@ -243,6 +236,8 @@ install-data-local: # XXX to appease distcheck we need to remove "stuff" here... uninstall-local: + @rm -f $(DESTDIR)$(bindir)/rpmquery + @rm -f $(DESTDIR)$(bindir)/rpmverify @rm -rf $(DESTDIR)$(rpmconfigdir)/platform/ MAINTAINERCLEANFILES = ChangeLog |