Fix out of source directory build (ticket #65)

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 456ccff..1467a55 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -56,8 +56,10 @@ else
 librpm_la_LIBADD += @WITH_DB_LIB@
 endif
 
-tagtbl.c: Makefile.am $(top_srcdir)/lib/rpmtag.h gentagtbl.sh
-       @AWK=${AWK} ${SHELL} gentagtbl.sh $(top_srcdir)/lib/rpmtag.h > $@
+tagtbl.c: Makefile.am $(srcdir)/rpmtag.h gentagtbl.sh
+       @AWK=${AWK} ${SHELL} $(srcdir)/gentagtbl.sh \
+                            $(srcdir)/rpmtag.h > $@.new && \
+        mv -f $@.new $@
 BUILT_SOURCES = tagtbl.c
 
 if WITH_INTERNAL_DB

diff --git a/lib/tagname.c b/lib/tagname.c
index cdc5ad6..abf278e 100644 (file)
--- a/lib/tagname.c
+++ b/lib/tagname.c
@@ -20,7 +20,7 @@ struct headerTagTableEntry_s {
     int extension;             /*!< Extension or "real" tag */
 };
 
-#include "tagtbl.c"
+#include "lib/tagtbl.c"
 
 static const int rpmTagTableSize = sizeof(rpmTagTable) / sizeof(rpmTagTable[0]) - 1;