diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2008-06-24 11:08:05 +0300 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2008-06-24 11:08:05 +0300 |
| commit | 6f06fff34884e334cd5eab3b371481b4e1039876 (patch) | |
| tree | 8bb4f8d05cf13684911abe480c72ee61306a91cb | |
| parent | aa9a791d808f504781d0b75255df3387383a1809 (diff) | |
| download | librpm-tizen-6f06fff34884e334cd5eab3b371481b4e1039876.tar.gz librpm-tizen-6f06fff34884e334cd5eab3b371481b4e1039876.tar.bz2 librpm-tizen-6f06fff34884e334cd5eab3b371481b4e1039876.zip | |
Eliminate the pointless rpmb + rpmt symlinkery
- just build "rpmbuild" executable and install to bindir instead of
mucking with several different names
| -rw-r--r-- | Makefile.am | 18 | ||||
| -rw-r--r-- | rpmqv.c | 4 |
2 files changed, 7 insertions, 15 deletions
diff --git a/Makefile.am b/Makefile.am index c89c31b3b..3998fedfc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -80,9 +80,9 @@ pkginclude_HEADERS += build/rpmspec.h rpmbindir = `echo $(bindir) | $(SED) -e s,usr/bin,bin,` rpmbin_PROGRAMS = rpm -bin_PROGRAMS = rpm2cpio +bin_PROGRAMS = rpm2cpio rpmbuild -rpmlibexec_PROGRAMS = rpmb rpmd rpmi rpmk rpmq +rpmlibexec_PROGRAMS = rpmd rpmi rpmk rpmq rpmconfig_SCRIPTS = find-provides find-requires mkinstalldirs \ config.guess config.sub DISTCLEANFILES = find-provides @@ -93,10 +93,10 @@ rpm_CPPFLAGS = $(AM_CPPFLAGS) -DIAM_RPMDB -DIAM_RPMEIU -DIAM_RPMK -DIAM_RPMQV rpm_LDADD = build/librpmbuild.la lib/librpm.la rpmio/librpmio.la rpm_LDADD += @WITH_LIBELF_LIB@ @WITH_NSS_LIB@ @WITH_POPT_LIB@ @WITH_ZLIB_LIB@ -rpmb_SOURCES = build.c rpmqv.c build.h debug.h system.h -rpmb_CPPFLAGS = $(AM_CPPFLAGS) -DIAM_RPMBT -rpmb_LDADD = build/librpmbuild.la lib/librpm.la rpmio/librpmio.la -rpmb_LDADD += @WITH_LIBELF_LIB@ @WITH_NSS_LIB@ @WITH_POPT_LIB@ @WITH_ZLIB_LIB@ +rpmbuild_SOURCES = build.c rpmqv.c build.h debug.h system.h +rpmbuild_CPPFLAGS = $(AM_CPPFLAGS) -DIAM_RPMBT +rpmbuild_LDADD = build/librpmbuild.la lib/librpm.la rpmio/librpmio.la +rpmbuild_LDADD += @WITH_LIBELF_LIB@ @WITH_NSS_LIB@ @WITH_POPT_LIB@ @WITH_ZLIB_LIB@ rpmd_SOURCES = rpmqv.c debug.h system.h rpmd_CPPFLAGS = $(AM_CPPFLAGS) -DIAM_RPMDB @@ -219,16 +219,12 @@ rpmvardir = $(localstatedir)/lib/rpm rpmvar_DATA = install-exec-hook: - @rm -f $(DESTDIR)$(rpmlibexecdir)/rpmt - @@LN_S@ rpmb $(DESTDIR)$(rpmlibexecdir)/rpmt @rm -f $(DESTDIR)$(rpmlibexecdir)/rpme @@LN_S@ rpmi $(DESTDIR)$(rpmlibexecdir)/rpme @rm -f $(DESTDIR)$(rpmlibexecdir)/rpmu @@LN_S@ rpmi $(DESTDIR)$(rpmlibexecdir)/rpmu @rm -f $(DESTDIR)$(rpmlibexecdir)/rpmv @@LN_S@ rpmq $(DESTDIR)$(rpmlibexecdir)/rpmv - rm -f $(DESTDIR)$(bindir)/rpmbuild - @LN_S@ ../lib/rpm/rpmb $(DESTDIR)$(bindir)/rpmbuild rm -f $(DESTDIR)$(bindir)/rpmquery @LN_S@ ../lib/rpm/rpmq $(DESTDIR)$(bindir)/rpmquery rm -f $(DESTDIR)$(bindir)/rpmverify @@ -254,10 +250,8 @@ uninstall-local: @rm -rf $(DESTDIR)/$(rpmconfigdir)/platform @rm -f $(DESTDIR)$(rpmlibexecdir)/rpmu @rm -f $(DESTDIR)$(rpmlibexecdir)/rpme - @rm -f $(DESTDIR)$(rpmlibexecdir)/rpmt @rm -f $(DESTDIR)$(rpmlibexecdir)/rpmv @rm -f $(DESTDIR)$(bindir)/rpmquery - @rm -f $(DESTDIR)$(bindir)/rpmbuild @rm -f $(DESTDIR)$(bindir)/rpmu @rm -f $(DESTDIR)$(bindir)/rpmsign @rm -f $(DESTDIR)$(bindir)/rpme @@ -211,9 +211,7 @@ int main(int argc, char *argv[]) /* Set the major mode based on argv[0] */ #ifdef IAM_RPMBT - if (!strcmp(__progname, "rpmb")) bigMode = MODE_BUILD; - if (!strcmp(__progname, "lt-rpmb")) bigMode = MODE_BUILD; - if (!strcmp(__progname, "rpmt")) bigMode = MODE_TARBUILD; + if (!strcmp(__progname, "lt-rpmbuild")) bigMode = MODE_BUILD; if (!strcmp(__progname, "rpmbuild")) bigMode = MODE_BUILD; #endif #ifdef IAM_RPMQV |