Eliminate clean-local:

diff --git a/Makefile.am b/Makefile.am
index 3cf39d0..643b196 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -172,7 +172,7 @@ install-data-local:
        solaris*|linux*|darwin*) \
           chmod u+x $(top_srcdir)/installplatform; DESTDIR="$(DESTDIR)" pkglibdir="$(pkglibdir)" $(top_srcdir)/installplatform rpmrc macros platform ;; \
        esac
-       @$(MKDIR_P) $(DESTDIR)/var/tmp
+       @$(MKDIR_P) $(DESTDIR)$(localstatedir)/tmp
 
 # XXX to appease distcheck we need to remove "stuff" here...
 uninstall-local:

diff --git a/build/Makefile.am b/build/Makefile.am
index 15857eb..8d595cb 100644 (file)
--- a/build/Makefile.am
+++ b/build/Makefile.am
@@ -30,9 +30,6 @@ librpmbuild_la_LDFLAGS = -release 4.4 \
        $(top_builddir)/rpmio/librpmio.la \
        @WITH_LIBELF_LIB@
 
-clean-local:
-       rm -f *.o 
-
 #BUILT_SOURCES = rpmbuild.lcd
 
 rpmbuild.lcd: Makefile.am ${librpmbuild_la_SOURCES} ${pkginc_HEADERS} ${noinst_HEADERS}

diff --git a/rpmdb/Makefile.am b/rpmdb/Makefile.am
index 0773a60..1a310f7 100644 (file)
--- a/rpmdb/Makefile.am
+++ b/rpmdb/Makefile.am
@@ -54,9 +54,6 @@ librpmdb_la_LDFLAGS = -release 4.4 \
 librpmdb_la_LIBADD = $(libdb_la)
 librpmdb_la_DEPENDENCIES = $(libdb_la)
 
-# XXX make sure that db.h symlink is generated
-dbconfig.c: db.h
-
 tagtbl.c: Makefile.am $(top_srcdir)/lib/rpmlib.h 
        @echo '/*@-bounds@*/' > $@
        @echo '#include "system.h"' >> $@
@@ -76,13 +73,15 @@ tagtbl.c: Makefile.am $(top_srcdir)/lib/rpmlib.h
        @echo 'const int rpmTagTableSize = sizeof(rpmTagTbl) / sizeof(rpmTagTbl[0]) - 1;' >> $@
        @echo '/*@=bounds@*/' >> $@
 
-db.h:
-       @ln -sf ../$(WITH_DB_SUBDIR)/db.h $@
+db.h:  ../$(WITH_DB_SUBDIR)/db.h
+       $(LN_S) ../$(WITH_DB_SUBDIR)/db.h $@
+CLEANFILES = db.h
 
 # XXX grrr, force noinst libdb.la for db3.
 $(libdb_la): $(top_builddir)/$(WITH_DB_SUBDIR)/libdb-4.6.la
        sed -e"/^libdir=/s/^.*$$/libdir=''/" \
          < $(top_builddir)/$(WITH_DB_SUBDIR)/libdb-4.6.la > $(libdb_la)
+CLEANFILES += $(libdb_la)
 
 rpmdb_archive_SOURCES =
 rpmdb_archive_LDADD = \
@@ -170,9 +169,6 @@ rpmdb_verify_LDADD = \
        $(top_builddir)/$(WITH_DB_SUBDIR)/util_sig.o \
        librpmdb.la
 
-clean-local:
-       rm -f *.o db.h $(libdb_la)
-
 BUILT_SOURCES = tagtbl.c
 
 rpmdb.lcd: Makefile.am ${librpmdb_la_SOURCES} ${pkginc_HEADERS} ${noinst_HEADERS}

diff --git a/rpmio/Makefile.am b/rpmio/Makefile.am
index b1092dc..2f04f84 100644 (file)
--- a/rpmio/Makefile.am
+++ b/rpmio/Makefile.am
@@ -32,9 +32,6 @@ librpmio_la_LDFLAGS = -release 4.4 \
        @WITH_ZLIB_LIB@ \
        -lpthread
 
-clean-local:
-       rm -f *.o
-
 #BUILT_SOURCES = rpmio.lcd
 
 rpmio.lcd: Makefile.am ${librpmio_la_SOURCES} ${pkginc_HEADERS} ${noinst_HEADERS}