Automake portability diddles.

CVS patchset: 3586
CVS date: 2000/02/24 22:28:31

21 files changed, 165 insertions, 188 deletions

diff --git a/Makefile.am b/Makefile.am
index f3b9cd3ee..fd117fa15 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,19 +14,16 @@ EXTRA_PROGRAMS = rpmconvert
 # XXX TODO: python perl
 SUBDIRS = intl po popt build lib misc tools scripts tests doc .
 
-INCLUDES = \
-	-I$(top_srcdir)/build \
-	-I$(top_srcdir)/lib \
-	-I$(top_srcdir)/popt \
+INCLUDES = -I$(top_srcdir)/build -I$(top_srcdir)/lib -I$(top_srcdir)/popt \
 	@INCPATH@
 
-mylibs=	$(top_builddir)/build/librpmbuild.la \
-	$(top_builddir)/lib/librpm.la \
-	$(top_builddir)/popt/libpopt.la \
-	@INTLLIBS@ \
-	@LIBMISC@
+myldflags= -L$(top_builddir)/build -L$(top_builddir)/lib -L$(top_builddir)/popt
+# XXX libtool generates dependent libs.
+myldadd= $(top_builddir)/build/librpmbuild.la \
+	@INTLLIBS@ @LIBMISC@
 
-LDFLAGS = @LDFLAGS_STATIC@
+LDFLAGS = @LDFLAGS_STATIC@ $(myldflags)
+LDADD = $(myldadd)
 
 rpmbindir = `echo $(bindir) | sed -e s,usr/bin,bin,`
 rpmbin_PROGRAMS = rpm
@@ -45,9 +42,8 @@ noinst_HEADERS = \
 	acconfig.h	build.h		system.h
 
 rpm_SOURCES =		build.c rpm.c
-rpm_LDADD =		$(mylibs)
 
-$(PROGRAMS): 		$(mylibs)
+$(PROGRAMS): 		$(myldadd)
 
 .PHONY:	lclint
 lclint:
@@ -56,11 +52,10 @@ lclint:
 CVSTAG = r$(subst .,-,$(VERSION))
 
 rpm2cpio_SOURCES =	rpm2cpio.c
-rpm2cpio_LDADD =	$(mylibs)
 
 rpmconvert_SOURCES =	convertdb.c oldrpmdb.c
 ## Libmisc.a is required for rpmconvert.
-rpmconvert_LDADD =	$(mylibs) -lgdbm
+rpmconvert_LDADD =	$(myldadd) -lgdbm
 
 install-data-local:
 	@$(mkinstalldirs) $(DESTDIR)$(varprefix)/lib/rpm
diff --git a/build/Makefile.am b/build/Makefile.am
index 9efe29c07..e0ac16bfd 100644
--- a/build/Makefile.am
+++ b/build/Makefile.am
@@ -2,10 +2,7 @@
 
 AUTOMAKE_OPTIONS = 1.4 foreign
 
-INCLUDES = \
-	-I$(top_srcdir) \
-	-I$(top_srcdir)/lib \
-	-I$(top_srcdir)/popt \
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/popt \
 	@INCPATH@
 
 pkgincdir = $(pkgincludedir)
@@ -18,6 +15,7 @@ librpmbuild_la_SOURCES = \
 	parseBuildInstallClean.c parseChangelog.c parseDescription.c \
 	parseFiles.c parsePreamble.c parsePrep.c parseReqs.c parseScript.c \
 	parseSpec.c reqprov.c spec.c
+librpmbuild_la_LIBADD = -lrpm -lpopt
 
 .PHONY:	lclint
 lclint:
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 93c67efd4..b8e564de9 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -2,11 +2,7 @@
 
 AUTOMAKE_OPTIONS = 1.4 foreign
 
-INCLUDES = \
-	-I$(top_srcdir) \
-	-I$(top_srcdir)/build \
-	-I$(top_srcdir)/popt \
-	@INCPATH@
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/build -I$(top_srcdir)/popt @INCPATH@
 
 pkgincdir = $(pkgincludedir)
 pkginc_HEADERS = \
@@ -16,11 +12,8 @@ noinst_HEADERS = \
 	lookup.h md5.h oldheader.h oldrpmdb.h rpm_malloc.h \
 	rpmdb.h rpmlead.h signature.h
 
-mylibs= $(top_builddir)/lib/.libs/librpm.a \
-        $(top_builddir)/popt/.libs/libpopt.a \
-        @INTLLIBS@ \
-        @LIBMISC@
-
+mylibpaths= -L$(top_builddir)/lib -L$(top_builddir)/popt
+mylibs=	-lrpm -lpopt @INTLLIBS@ @LIBMISC@
 
 lib_LTLIBRARIES = librpm.la
 librpm_la_SOURCES = \
@@ -58,5 +51,4 @@ rpmeval: macro.c
 	$(CC) $(CFLAGS) $(DEFS) -DDEBUG_MACROS -DEVAL_MACROS $(INCLUDES) -o $@ $<
 
 tufdio: tufdio.c
-	$(CC) $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ $< $(mylibs) $(LIBS)
-
+	$(CC) $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ $< $(mylibpaths) $(mylibs) $(LIBS)
diff --git a/lib/misc.c b/lib/misc.c
index fdbcab6de..4afbfcaaf 100644
--- a/lib/misc.c
+++ b/lib/misc.c
@@ -800,7 +800,7 @@ int rpmHeaderGetEntry(Header h, int_32 tag, int_32 *type,
 	/* XXX FIXME: memory leak. */
         msgstr = headerSprintf(h, fmt, rpmTagTable, rpmHeaderFormats, &errstr);
 	if (msgstr) {
-	    *p = msgstr;
+	    *p = (void *) msgstr;
 	    if (type)	*type = RPM_STRING_TYPE;
 	    if (c)	*c = 1;
 	    return 1;
diff --git a/misc/err.h b/misc/err.h
index 993192e1a..614343309 100644
--- a/misc/err.h
+++ b/misc/err.h
@@ -22,6 +22,9 @@
 
 #define	__need___va_list
 #include <stdarg.h>
+#ifndef __ptr_t
+#define	__ptr_t		void *
+#endif
 #ifndef	__GNUC_VA_LIST
 # define __gnuc_va_list	__ptr_t
 #endif
diff --git a/po/cs.po b/po/cs.po
index b7c24e5e9..ed0008e73 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-02-23 17:41-0500\n"
+"POT-Creation-Date: 2000-02-24 13:14-0500\n"
 "PO-Revision-Date: 1998-10-10 10:10+0200\n"
 "Last-Translator: Pavel Makovec <pavelm@terminal.cz>\n"
 "Language-Team: Czech <pavelm@terminal.cz>\n"
@@ -2991,7 +2991,7 @@ msgstr "OK"
 msgid "opening database mode 0x%x in %s\n"
 msgstr "probíhá otevírání databázového re¾imu: 0%o\n"
 
-#: lib/rpmdb.c:160 lib/url.c:442
+#: lib/rpmdb.c:160 lib/url.c:445
 #, fuzzy, c-format
 msgid "failed to open %s: %s\n"
 msgstr "nelze otevøít %s: %s"
@@ -3557,38 +3557,38 @@ msgstr "odstraòuje se polo¾ka databáze\n"
 msgid "execution of script failed"
 msgstr "skript nelze spustit"
 
-#: lib/url.c:85
+#: lib/url.c:88
 #, c-format
 msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: lib/url.c:102
+#: lib/url.c:105
 #, c-format
 msgid "warning: u %p data %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: lib/url.c:129
+#: lib/url.c:132
 #, c-format
 msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 msgstr ""
 
-#: lib/url.c:215
+#: lib/url.c:218
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "Heslo pro %s@%s: "
 
-#: lib/url.c:240 lib/url.c:266
+#: lib/url.c:243 lib/url.c:269
 #, fuzzy, c-format
 msgid "error: %sport must be a number\n"
 msgstr "chyba: ftpport musí být èíslo\n"
 
-#: lib/url.c:402
+#: lib/url.c:405
 #, fuzzy
 msgid "url port must be a number\n"
 msgstr "chyba: ftpport musí být èíslo\n"
 
 #. XXX Fstrerror
-#: lib/url.c:459
+#: lib/url.c:462
 #, fuzzy, c-format
 msgid "failed to create %s: %s\n"
 msgstr "%s nelze vytvoøit\n"
diff --git a/po/de.po b/po/de.po
index fbe044124..be50d5d9d 100644
--- a/po/de.po
+++ b/po/de.po
@@ -37,7 +37,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 2.5.2\n"
-"POT-Creation-Date: 2000-02-23 17:41-0500\n"
+"POT-Creation-Date: 2000-02-24 13:14-0500\n"
 "PO-Revision-Date: 1998-08-03 18:02+02:00\n"
 "Last-Translator: Karl Eichwalder <ke@SuSE.DE>\n"
 "Language-Team: German <de@li.org>\n"
@@ -3110,7 +3110,7 @@ msgid "opening database mode 0x%x in %s\n"
 msgstr "Datenbank aus der vorhandenen neu erstellen"
 
 # , c-format
-#: lib/rpmdb.c:160 lib/url.c:442
+#: lib/rpmdb.c:160 lib/url.c:445
 #, fuzzy, c-format
 msgid "failed to open %s: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
@@ -3695,39 +3695,39 @@ msgstr ""
 msgid "execution of script failed"
 msgstr "Ausführung des Skripts fehlgeschlagen"
 
-#: lib/url.c:85
+#: lib/url.c:88
 #, c-format
 msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: lib/url.c:102
+#: lib/url.c:105
 #, c-format
 msgid "warning: u %p data %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: lib/url.c:129
+#: lib/url.c:132
 #, c-format
 msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 msgstr ""
 
-#: lib/url.c:215
+#: lib/url.c:218
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "Passworf für %s@%s: "
 
-#: lib/url.c:240 lib/url.c:266
+#: lib/url.c:243 lib/url.c:269
 #, fuzzy, c-format
 msgid "error: %sport must be a number\n"
 msgstr "Fehler: der FTP-Port muss eine Zahl sein\n"
 
-#: lib/url.c:402
+#: lib/url.c:405
 #, fuzzy
 msgid "url port must be a number\n"
 msgstr "Fehler: der FTP-Port muss eine Zahl sein\n"
 
 # , c-format
 #. XXX Fstrerror
-#: lib/url.c:459
+#: lib/url.c:462
 #, fuzzy, c-format
 msgid "failed to create %s: %s\n"
 msgstr "anlegen von %s fehlgeschlagen\n"
diff --git a/po/fi.po b/po/fi.po
index 2bbef2e49..254d1659c 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-02-23 17:41-0500\n"
+"POT-Creation-Date: 2000-02-24 13:14-0500\n"
 "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
 "Language-Team: Finnish <linux@sot.com>\n"
 "Content-Type: text/plain; charset=\n"
@@ -3029,7 +3029,7 @@ msgstr ""
 msgid "opening database mode 0x%x in %s\n"
 msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
 
-#: lib/rpmdb.c:160 lib/url.c:442
+#: lib/rpmdb.c:160 lib/url.c:445
 #, fuzzy, c-format
 msgid "failed to open %s: %s\n"
 msgstr "en voinut avata %s: %s"
@@ -3604,38 +3604,38 @@ msgstr ""
 msgid "execution of script failed"
 msgstr "skriptin ajo epäonnistui"
 
-#: lib/url.c:85
+#: lib/url.c:88
 #, c-format
 msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: lib/url.c:102
+#: lib/url.c:105
 #, c-format
 msgid "warning: u %p data %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: lib/url.c:129
+#: lib/url.c:132
 #, c-format
 msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 msgstr ""
 
-#: lib/url.c:215
+#: lib/url.c:218
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "%s@%s:n salasana: "
 
-#: lib/url.c:240 lib/url.c:266
+#: lib/url.c:243 lib/url.c:269
 #, fuzzy, c-format
 msgid "error: %sport must be a number\n"
 msgstr "virhe: ftpport pitää olla luku\n"
 
-#: lib/url.c:402
+#: lib/url.c:405
 #, fuzzy
 msgid "url port must be a number\n"
 msgstr "virhe: ftpport pitää olla luku\n"
 
 #. XXX Fstrerror
-#: lib/url.c:459
+#: lib/url.c:462
 #, fuzzy, c-format
 msgid "failed to create %s: %s\n"
 msgstr "%s:n luonti epäonnistui\n"
diff --git a/po/fr.po b/po/fr.po
index f1b52d77a..69ade225d 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,5 +1,5 @@
 msgid ""
-msgstr "POT-Creation-Date: 2000-02-23 17:41-0500\n"
+msgstr "POT-Creation-Date: 2000-02-24 13:14-0500\n"
 
 #: build.c:25 lib/rpminstall.c:250 lib/rpminstall.c:424
 #, c-format
@@ -3032,7 +3032,7 @@ msgstr ""
 msgid "opening database mode 0x%x in %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:160 lib/url.c:442
+#: lib/rpmdb.c:160 lib/url.c:445
 #, fuzzy, c-format
 msgid "failed to open %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
@@ -3591,37 +3591,37 @@ msgstr ""
 msgid "execution of script failed"
 msgstr ""
 
-#: lib/url.c:85
+#: lib/url.c:88
 #, c-format
 msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: lib/url.c:102
+#: lib/url.c:105
 #, c-format
 msgid "warning: u %p data %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: lib/url.c:129
+#: lib/url.c:132
 #, c-format
 msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 msgstr ""
 
-#: lib/url.c:215
+#: lib/url.c:218
 #, c-format
 msgid "Password for %s@%s: "
 msgstr ""
 
-#: lib/url.c:240 lib/url.c:266
+#: lib/url.c:243 lib/url.c:269
 #, c-format
 msgid "error: %sport must be a number\n"
 msgstr ""
 
-#: lib/url.c:402
+#: lib/url.c:405
 msgid "url port must be a number\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: lib/url.c:459
+#: lib/url.c:462
 #, fuzzy, c-format
 msgid "failed to create %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
diff --git a/po/ja.po b/po/ja.po
index ea4586247..4ce2dd356 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm-3.0.4\n"
-"POT-Creation-Date: 2000-02-23 17:41-0500\n"
+"POT-Creation-Date: 2000-02-24 13:14-0500\n"
 "PO-Revision-Date: 1999-12-01 22:49 +JST\n"
 "Last-Translator: Kanda Mitsuru <kanda@nn.iij4u.or.jp>\n"
 "Language-Team: JRPM <jrpm@linux.or.jp>\n"
@@ -193,7 +193,7 @@ msgstr "copyright ¤¬¤¢¤ê¤Þ¤»¤ó!\n"
 # build root [BuildRoot]
 # net share [¥Í¥Ã¥È¶¦Í­]
 # reloate [ºÆÇÛÃÖ/°ÜÆ°¤¹¤ë]
-# $Id: ja.po,v 1.23 2000/02/23 22:43:27 jbj Exp $
+# $Id: ja.po,v 1.24 2000/02/24 22:28:32 jbj Exp $
 #: rpm.c:197
 #, c-format
 msgid "rpm: %s\n"
@@ -3013,7 +3013,7 @@ msgstr ""
 msgid "opening database mode 0x%x in %s\n"
 msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¥â¡¼¥É 0x%x ¤Î¥ª¡¼¥×¥ó (%s)\n"
 
-#: lib/rpmdb.c:160 lib/url.c:442
+#: lib/rpmdb.c:160 lib/url.c:445
 #, fuzzy, c-format
 msgid "failed to open %s: %s\n"
 msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s"
@@ -3585,38 +3585,38 @@ msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¥¨¥ó¥È¥ê¤òºï½ü¤·¤Þ¤¹\n"
 msgid "execution of script failed"
 msgstr "¥¹¥¯¥ê¥×¥È¤Î¼Â¹Ô¤Ë¼ºÇÔ"
 
-#: lib/url.c:85
+#: lib/url.c:88
 #, c-format
 msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: lib/url.c:102
+#: lib/url.c:105
 #, c-format
 msgid "warning: u %p data %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: lib/url.c:129
+#: lib/url.c:132
 #, c-format
 msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 msgstr ""
 
-#: lib/url.c:215
+#: lib/url.c:218
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "%s@%s ¤Î¥Ñ¥¹¥ï¡¼¥É:"
 
-#: lib/url.c:240 lib/url.c:266
+#: lib/url.c:243 lib/url.c:269
 #, fuzzy, c-format
 msgid "error: %sport must be a number\n"
 msgstr "¥¨¥é¡¼: %s¥Ý¡¼¥È¤Ï¿ô»ú¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n"
 
-#: lib/url.c:402
+#: lib/url.c:405
 #, fuzzy
 msgid "url port must be a number\n"
 msgstr "url ¥Ý¡¼¥È¤Ï¿ô»ú¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n"
 
 #. XXX Fstrerror
-#: lib/url.c:459
+#: lib/url.c:462
 #, fuzzy, c-format
 msgid "failed to create %s: %s\n"
 msgstr "%s ¤ÎºîÀ®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
diff --git a/po/pl.po b/po/pl.po
index 00bce2e06..825d0f66e 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm-3.0.2\n"
-"POT-Creation-Date: 2000-02-23 17:41-0500\n"
+"POT-Creation-Date: 2000-02-24 13:14-0500\n"
 "PO-Revision-Date: 1999-05-25 17:00+0100\n"
 "Last-Translator: Pawe³ Dziekoñski <pdziekonski@mml.ch.pwr.wroc.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -2932,7 +2932,7 @@ msgstr "OK"
 msgid "opening database mode 0x%x in %s\n"
 msgstr "otwiernie bazê danych w trybie 0x%x w %s\n"
 
-#: lib/rpmdb.c:160 lib/url.c:442
+#: lib/rpmdb.c:160 lib/url.c:445
 #, fuzzy, c-format
 msgid "failed to open %s: %s\n"
 msgstr "nie mo¿na otworzyæ %s: %s"
@@ -3486,37 +3486,37 @@ msgstr "usuwanie wpisu w bazie\n"
 msgid "execution of script failed"
 msgstr "wykonanie skryptu nie powiod³o siê"
 
-#: lib/url.c:85
+#: lib/url.c:88
 #, c-format
 msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: lib/url.c:102
+#: lib/url.c:105
 #, c-format
 msgid "warning: u %p data %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: lib/url.c:129
+#: lib/url.c:132
 #, c-format
 msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 msgstr ""
 
-#: lib/url.c:215
+#: lib/url.c:218
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "Has³o dla %s@%s: "
 
-#: lib/url.c:240 lib/url.c:266
+#: lib/url.c:243 lib/url.c:269
 #, c-format
 msgid "error: %sport must be a number\n"
 msgstr "b³±d: %sport musi byæ liczb±\n"
 
-#: lib/url.c:402
+#: lib/url.c:405
 msgid "url port must be a number\n"
 msgstr "port musi byæ liczb±\n"
 
 #. XXX Fstrerror
-#: lib/url.c:459
+#: lib/url.c:462
 #, fuzzy, c-format
 msgid "failed to create %s: %s\n"
 msgstr "utworzenie %s nie powiod³o siê\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index c2f0701a8..2f3068b8b 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -2,7 +2,7 @@
 # Revised by Arnaldo Carvalho de Melo <acme@conectiva.com.br>, 1998.
 #
 msgid ""
-msgstr "POT-Creation-Date: 2000-02-23 17:41-0500\n"
+msgstr "POT-Creation-Date: 2000-02-24 13:14-0500\n"
 
 #: build.c:25 lib/rpminstall.c:250 lib/rpminstall.c:424
 #, c-format
@@ -3103,7 +3103,7 @@ msgid "opening database mode 0x%x in %s\n"
 msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
 
 # , c-format
-#: lib/rpmdb.c:160 lib/url.c:442
+#: lib/rpmdb.c:160 lib/url.c:445
 #, fuzzy, c-format
 msgid "failed to open %s: %s\n"
 msgstr "Não consegui abrir: %s\n"
@@ -3697,38 +3697,38 @@ msgstr ""
 msgid "execution of script failed"
 msgstr ""
 
-#: lib/url.c:85
+#: lib/url.c:88
 #, c-format
 msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: lib/url.c:102
+#: lib/url.c:105
 #, c-format
 msgid "warning: u %p data %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: lib/url.c:129
+#: lib/url.c:132
 #, c-format
 msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 msgstr ""
 
-#: lib/url.c:215
+#: lib/url.c:218
 #, c-format
 msgid "Password for %s@%s: "
 msgstr ""
 
-#: lib/url.c:240 lib/url.c:266
+#: lib/url.c:243 lib/url.c:269
 #, c-format
 msgid "error: %sport must be a number\n"
 msgstr ""
 
-#: lib/url.c:402
+#: lib/url.c:405
 msgid "url port must be a number\n"
 msgstr ""
 
 # , c-format
 #. XXX Fstrerror
-#: lib/url.c:459
+#: lib/url.c:462
 #, fuzzy, c-format
 msgid "failed to create %s: %s\n"
 msgstr "Não consegui abrir o pipe tar: %s\n"
diff --git a/po/rpm.pot b/po/rpm.pot
index 39a22beef..cf4aced23 100644
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-02-23 17:41-0500\n"
+"POT-Creation-Date: 2000-02-24 13:14-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2858,7 +2858,7 @@ msgstr ""
 msgid "opening database mode 0x%x in %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:160 lib/url.c:442
+#: lib/rpmdb.c:160 lib/url.c:445
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr ""
@@ -3408,37 +3408,37 @@ msgstr ""
 msgid "execution of script failed"
 msgstr ""
 
-#: lib/url.c:85
+#: lib/url.c:88
 #, c-format
 msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: lib/url.c:102
+#: lib/url.c:105
 #, c-format
 msgid "warning: u %p data %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: lib/url.c:129
+#: lib/url.c:132
 #, c-format
 msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 msgstr ""
 
-#: lib/url.c:215
+#: lib/url.c:218
 #, c-format
 msgid "Password for %s@%s: "
 msgstr ""
 
-#: lib/url.c:240 lib/url.c:266
+#: lib/url.c:243 lib/url.c:269
 #, c-format
 msgid "error: %sport must be a number\n"
 msgstr ""
 
-#: lib/url.c:402
+#: lib/url.c:405
 msgid "url port must be a number\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: lib/url.c:459
+#: lib/url.c:462
 #, c-format
 msgid "failed to create %s: %s\n"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 70b51944a..9abc510fa 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-02-23 17:41-0500\n"
+"POT-Creation-Date: 2000-02-24 13:14-0500\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -2936,7 +2936,7 @@ msgstr "Ok"
 msgid "opening database mode 0x%x in %s\n"
 msgstr "ÏÔËÒÙ×ÁÀ ÂÁÚÕ × ÒÅÖÉÍÅ 0x%x × %s\n"
 
-#: lib/rpmdb.c:160 lib/url.c:442
+#: lib/rpmdb.c:160 lib/url.c:445
 #, fuzzy, c-format
 msgid "failed to open %s: %s\n"
 msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ %s: %s"
@@ -3493,37 +3493,37 @@ msgstr "ÕÄÁÌÑÀ ÚÁÐÉÓØ ÂÁÚÙ ÄÁÎÎÙÈ\n"
 msgid "execution of script failed"
 msgstr "ÏÛÉÂËÁ ÉÓÐÏÌÎÅÎÉÑ ÓËÒÉÐÔÁ"
 
-#: lib/url.c:85
+#: lib/url.c:88
 #, c-format
 msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: lib/url.c:102
+#: lib/url.c:105
 #, c-format
 msgid "warning: u %p data %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: lib/url.c:129
+#: lib/url.c:132
 #, c-format
 msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 msgstr ""
 
-#: lib/url.c:215
+#: lib/url.c:218
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "ðÁÒÏÌØ ÄÌÑ %s@%s: "
 
-#: lib/url.c:240 lib/url.c:266
+#: lib/url.c:243 lib/url.c:269
 #, c-format
 msgid "error: %sport must be a number\n"
 msgstr "ÏÛÉÂËÁ: %sport ÄÏÌÖÅÎ ÂÙÔØ ÞÉÓÌÏÍ\n"
 
-#: lib/url.c:402
+#: lib/url.c:405
 msgid "url port must be a number\n"
 msgstr "url port ÄÏÌÖÅÎ ÂÙÔØ ÞÉÓÌÏÍ\n"
 
 #. XXX Fstrerror
-#: lib/url.c:459
+#: lib/url.c:462
 #, fuzzy, c-format
 msgid "failed to create %s: %s\n"
 msgstr "ÎÅ ÍÏÇÕ ÓÏÚÄÁÔØ %s\n"
diff --git a/po/sk.po b/po/sk.po
index f3a408237..7e86c6e85 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 2.93\n"
-"POT-Creation-Date: 2000-02-23 17:41-0500\n"
+"POT-Creation-Date: 2000-02-24 13:14-0500\n"
 "PO-Revision-Date: 1999-04-08 21:37+02:00\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -2940,7 +2940,7 @@ msgstr "V PORIADKU"
 msgid "opening database mode 0x%x in %s\n"
 msgstr "otvára sa databáza s právami 0x%x v %s\n"
 
-#: lib/rpmdb.c:160 lib/url.c:442
+#: lib/rpmdb.c:160 lib/url.c:445
 #, fuzzy, c-format
 msgid "failed to open %s: %s\n"
 msgstr "nepodarilo sa otvori» %s: %s"
@@ -3494,37 +3494,37 @@ msgstr "odstraòuje sa záznam z databázy\n"
 msgid "execution of script failed"
 msgstr "vykonanie skriptu zlyhalo"
 
-#: lib/url.c:85
+#: lib/url.c:88
 #, c-format
 msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: lib/url.c:102
+#: lib/url.c:105
 #, c-format
 msgid "warning: u %p data %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: lib/url.c:129
+#: lib/url.c:132
 #, c-format
 msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 msgstr ""
 
-#: lib/url.c:215
+#: lib/url.c:218
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "Heslo pre %s@%s: "
 
-#: lib/url.c:240 lib/url.c:266
+#: lib/url.c:243 lib/url.c:269
 #, c-format
 msgid "error: %sport must be a number\n"
 msgstr "chyba: %sport musí by» èíslo\n"
 
-#: lib/url.c:402
+#: lib/url.c:405
 msgid "url port must be a number\n"
 msgstr "url port musí by» èíslo\n"
 
 #. XXX Fstrerror
-#: lib/url.c:459
+#: lib/url.c:462
 #, fuzzy, c-format
 msgid "failed to create %s: %s\n"
 msgstr "nepodarilo sa vytvori» %s\n"
diff --git a/po/sl.po b/po/sl.po
index 2d7124d3a..43cef0129 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,12 +1,12 @@
 # -*- mode:po; coding:iso-latin-2; -*- Slovenian messages for Redhat pkg. mngr.
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Primo¾ Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2000.
-# $Id: sl.po,v 1.8 2000/02/23 22:43:27 jbj Exp $
+# $Id: sl.po,v 1.9 2000/02/24 22:28:32 jbj Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 3.0.4\n"
-"POT-Creation-Date: 2000-02-23 17:41-0500\n"
+"POT-Creation-Date: 2000-02-24 13:14-0500\n"
 "PO-Revision-Date: 2000-02-17 22:25+01:00\n"
 "Last-Translator: Primo¾ Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -2926,7 +2926,7 @@ msgstr "V REDU"
 msgid "opening database mode 0x%x in %s\n"
 msgstr "odpiramo datoteko z naèinom 0x%x v %s\n"
 
-#: lib/rpmdb.c:160 lib/url.c:442
+#: lib/rpmdb.c:160 lib/url.c:445
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr "neuspe¹no odpiranje %s: %s\n"
@@ -3476,37 +3476,37 @@ msgstr "odstranjujemo vnose v podatkovni zbirki\n"
 msgid "execution of script failed"
 msgstr "skript se ni uspe¹no izvedel"
 
-#: lib/url.c:85
+#: lib/url.c:88
 #, c-format
 msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n"
 msgstr "opozorilo: u %p ctrl %p nrefs != 0 (%s %s)\n"
 
-#: lib/url.c:102
+#: lib/url.c:105
 #, c-format
 msgid "warning: u %p data %p nrefs != 0 (%s %s)\n"
 msgstr "opozorilo: u %p data %p nrefs != 0 (%s %s)\n"
 
-#: lib/url.c:129
+#: lib/url.c:132
 #, c-format
 msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 msgstr "opozorilo: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 
-#: lib/url.c:215
+#: lib/url.c:218
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "Geslo za %s@%s: "
 
-#: lib/url.c:240 lib/url.c:266
+#: lib/url.c:243 lib/url.c:269
 #, c-format
 msgid "error: %sport must be a number\n"
 msgstr "napaka: vrata %s morajo biti ¹tevilka\n"
 
-#: lib/url.c:402
+#: lib/url.c:405
 msgid "url port must be a number\n"
 msgstr "vrata URL morajo biti ¹tevilka\n"
 
 #. XXX Fstrerror
-#: lib/url.c:459
+#: lib/url.c:462
 #, c-format
 msgid "failed to create %s: %s\n"
 msgstr "neuspe¹no ustvarjanje %s: %s\n"
diff --git a/po/sr.po b/po/sr.po
index 6ca0af449..dad4478fe 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-02-23 17:41-0500\n"
+"POT-Creation-Date: 2000-02-24 13:14-0500\n"
 "Content-Type: text/plain; charset=\n"
 "Date: 1998-05-02 21:41:47-0400\n"
 "From: Erik Troan <ewt@lacrosse.redhat.com>\n"
@@ -2989,7 +2989,7 @@ msgstr ""
 msgid "opening database mode 0x%x in %s\n"
 msgstr "rekreiraj bazu podataka iz postojeæe baze"
 
-#: lib/rpmdb.c:160 lib/url.c:442
+#: lib/rpmdb.c:160 lib/url.c:445
 #, fuzzy, c-format
 msgid "failed to open %s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
@@ -3564,38 +3564,38 @@ msgstr ""
 msgid "execution of script failed"
 msgstr "neuspelo izvr¹avanje skripta"
 
-#: lib/url.c:85
+#: lib/url.c:88
 #, c-format
 msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: lib/url.c:102
+#: lib/url.c:105
 #, c-format
 msgid "warning: u %p data %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: lib/url.c:129
+#: lib/url.c:132
 #, c-format
 msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 msgstr ""
 
-#: lib/url.c:215
+#: lib/url.c:218
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "Lozinka za %s@%s: "
 
-#: lib/url.c:240 lib/url.c:266
+#: lib/url.c:243 lib/url.c:269
 #, fuzzy, c-format
 msgid "error: %sport must be a number\n"
 msgstr "gre¹ka: FTP port mora biti broj\n"
 
-#: lib/url.c:402
+#: lib/url.c:405
 #, fuzzy
 msgid "url port must be a number\n"
 msgstr "gre¹ka: FTP port mora biti broj\n"
 
 #. XXX Fstrerror
-#: lib/url.c:459
+#: lib/url.c:462
 #, fuzzy, c-format
 msgid "failed to create %s: %s\n"
 msgstr "neuspelo kreiranje %s\n"
diff --git a/po/sv.po b/po/sv.po
index 3c1054574..5cea33f7b 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,12 +1,12 @@
 # Swedish messages for RPM
 # Copyright © 1999 Free Software Foundation, Inc.
 # Göran Uddeborg <göran@uddeborg.pp.se>, 1999, 2000.
-# $Revision: 1.68 $
+# $Revision: 1.69 $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 3.0.4\n"
-"POT-Creation-Date: 2000-02-23 17:41-0500\n"
+"POT-Creation-Date: 2000-02-24 13:14-0500\n"
 "PO-Revision-Date: 2000-02-21 12:20+0100\n"
 "Last-Translator: Göran Uddeborg <göran@uddeborg.pp.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -2917,7 +2917,7 @@ msgstr "OK"
 msgid "opening database mode 0x%x in %s\n"
 msgstr "öppnar databas med rättighet 0x%x i %s\n"
 
-#: lib/rpmdb.c:160 lib/url.c:442
+#: lib/rpmdb.c:160 lib/url.c:445
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr "kunde inte öppna %s: %s\n"
@@ -3469,37 +3469,37 @@ msgstr "tar bort databasposter\n"
 msgid "execution of script failed"
 msgstr "skriptkörning misslyckades"
 
-#: lib/url.c:85
+#: lib/url.c:88
 #, c-format
 msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n"
 msgstr "varning: u %p ctrl %p nrefs != 0 (%s %s)\n"
 
-#: lib/url.c:102
+#: lib/url.c:105
 #, c-format
 msgid "warning: u %p data %p nrefs != 0 (%s %s)\n"
 msgstr "varning: u %p data %p nrefs != 0 (%s %s)\n"
 
-#: lib/url.c:129
+#: lib/url.c:132
 #, c-format
 msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 msgstr "varning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 
-#: lib/url.c:215
+#: lib/url.c:218
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "Lösenord för %s@%s: "
 
-#: lib/url.c:240 lib/url.c:266
+#: lib/url.c:243 lib/url.c:269
 #, c-format
 msgid "error: %sport must be a number\n"
 msgstr "fel: %s-port måste vara ett tal\n"
 
-#: lib/url.c:402
+#: lib/url.c:405
 msgid "url port must be a number\n"
 msgstr "url-port måste vara ett tal\n"
 
 #. XXX Fstrerror
-#: lib/url.c:459
+#: lib/url.c:462
 #, c-format
 msgid "failed to create %s: %s\n"
 msgstr "kunde inte skapa %s: %s\n"
diff --git a/po/tr.po b/po/tr.po
index b292ef1ae..038420593 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-02-23 17:41-0500\n"
+"POT-Creation-Date: 2000-02-24 13:14-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -3029,7 +3029,7 @@ msgstr ""
 msgid "opening database mode 0x%x in %s\n"
 msgstr "mevcut veritabanýný kullanýlarak veritabýnýný yeniden oluþturur"
 
-#: lib/rpmdb.c:160 lib/url.c:442
+#: lib/rpmdb.c:160 lib/url.c:445
 #, fuzzy, c-format
 msgid "failed to open %s: %s\n"
 msgstr "%s açýlamadý: %s"
@@ -3605,38 +3605,38 @@ msgstr ""
 msgid "execution of script failed"
 msgstr "betik (script) çalýþtýrýlamadý "
 
-#: lib/url.c:85
+#: lib/url.c:88
 #, c-format
 msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: lib/url.c:102
+#: lib/url.c:105
 #, c-format
 msgid "warning: u %p data %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: lib/url.c:129
+#: lib/url.c:132
 #, c-format
 msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 msgstr ""
 
-#: lib/url.c:215
+#: lib/url.c:218
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "%s'%s için parola"
 
-#: lib/url.c:240 lib/url.c:266
+#: lib/url.c:243 lib/url.c:269
 #, fuzzy, c-format
 msgid "error: %sport must be a number\n"
 msgstr "hata: ftpport bir sayý olmalý\n"
 
-#: lib/url.c:402
+#: lib/url.c:405
 #, fuzzy
 msgid "url port must be a number\n"
 msgstr "hata: ftpport bir sayý olmalý\n"
 
 #. XXX Fstrerror
-#: lib/url.c:459
+#: lib/url.c:462
 #, fuzzy, c-format
 msgid "failed to create %s: %s\n"
 msgstr "%s yaratýlamýyor\n"
diff --git a/rpm.spec b/rpm.spec
index cfc75e28c..5b3c1445c 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -94,6 +94,7 @@ make -C python
 
 %install
 rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_DIR/etc
 
 make DESTDIR="$RPM_BUILD_ROOT" install
 %ifos linux
@@ -133,6 +134,7 @@ fi
 %defattr(-,root,root)
 %doc RPM-PGP-KEY CHANGES GROUPS doc/manual/*
 /bin/rpm
+%dir /etc/rpm
 /usr/bin/rpm2cpio
 /usr/bin/gendiff
 /usr/lib/librpm.so.*
@@ -142,18 +144,15 @@ fi
 /usr/lib/rpm/config.guess
 /usr/lib/rpm/config.sub
 /usr/lib/rpm/convertrpmrc.sh
-/usr/lib/rpm/find-lang.sh
 /usr/lib/rpm/find-prov.pl
 /usr/lib/rpm/find-provides
 /usr/lib/rpm/find-req.pl
 /usr/lib/rpm/find-requires
 /usr/lib/rpm/freshen.sh
-/usr/lib/rpm/getpo.sh
 /usr/lib/rpm/macros
 /usr/lib/rpm/mkinstalldirs
 /usr/lib/rpm/rpmpopt
 /usr/lib/rpm/rpmrc
-/usr/lib/rpm/u_pkg.sh
 /usr/lib/rpm/vpkg-provides.sh
 /usr/lib/rpm/vpkg-provides2.sh
 
@@ -173,9 +172,11 @@ fi
 %defattr(-,root,root)
 /usr/lib/rpm/check-prereqs
 /usr/lib/rpm/cpanflute
+/usr/lib/rpm/find-lang.sh
 /usr/lib/rpm/find-provides.perl
 /usr/lib/rpm/find-requires.perl
 /usr/lib/rpm/get_magic.pl
+/usr/lib/rpm/getpo.sh
 /usr/lib/rpm/http.req
 /usr/lib/rpm/magic.prov
 /usr/lib/rpm/magic.req
@@ -185,6 +186,7 @@ fi
 /usr/lib/rpm/rpmdiff.cgi
 /usr/lib/rpm/rpmgettext
 /usr/lib/rpm/rpmputtext
+/usr/lib/rpm/u_pkg.sh
 
 %ifos linux
 %files python
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 80a876319..32278a60d 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -2,24 +2,21 @@
 
 AUTOMAKE_OPTIONS = 1.4 foreign
 
-INCLUDES = \
-	-I$(top_srcdir) \
-	-I$(top_srcdir)/build \
-	-I$(top_srcdir)/lib \
-	-I$(top_srcdir)/popt \
-	@INCPATH@ \
-	-I$(top_srcdir)/misc	# XXX for gettext includes
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/build \
+	-I$(top_srcdir)/lib -I$(top_srcdir)/popt \
+	@INCPATH@ -I$(top_srcdir)/misc
 
 EXTRA_DIST =	fstrcmp.c message.c str-list.c rpmchecksig.c
-mylibs=	$(top_builddir)/build/.libs/librpmbuild.a \
-	$(top_builddir)/lib/.libs/librpm.a \
-	$(top_builddir)/popt/.libs/libpopt.a \
-	@INTLLIBS@ \
-	@LIBMISC@
 
-EXTRA_PROGRAMS = rpmgettext rpmputtext
+EXTRA_PROGRAMS = rpmgettext rpmputtext rpminject
 
-LDADD = $(top_builddir)/lib/.libs/librpm.a $(top_builddir)/popt/.libs/libpopt.a @INTLLIBS@ @LIBMISC@
+# XXX should libtool generate dependent libs?
+myldadd= $(top_builddir)/build/librpmbuild.la \
+	$(top_builddir)/lib/librpm.la \
+	$(top_builddir)/popt/libpopt.la \
+	@INTLLIBS@ @LIBMISC@
+
+LDADD = $(myldadd)
 
 noinst_PROGRAMS = \
 	dump dumpdb javadeps rpmarchive rpmheader rpmlead rpmsignature
@@ -28,17 +25,7 @@ pkgbindir = @RPMCONFIGDIR@
 pkgbin_PROGRAMS = @BUILD_RPMNLSTOOLS@
 
 rpmgettext_SOURCES =	rpmgettext.c
-rpmgettext_LDADD =	$(mylibs)
 
 rpmputtext_SOURCES =	rpmgettext.c
-rpmputtext_LDADD =	$(mylibs)
-
-## Dumpdb requires fprint.o (in libmisc) and this requires realpath
-## (from libmisc).
-dumpdb_LDADD = $(mylibs)
-
-$(PROGRAMS): $(mylibs)
 
-rpminject: rpminject.o $(mylibs)
-	@rm -f rpminject
-	$(LINK) rpminject.o $(mylibs) $(LIBS)
+$(PROGRAMS): $(myldadd)