Flatten python makefiles, path tweaks

diff --git a/python/Makefile.am b/python/Makefile.am
index ae67ec2..642ccb4 100644 (file)
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -7,9 +7,9 @@ LINT = splint
 pylibdir = @WITH_PYTHON_LIB@
 pyincdir = @WITH_PYTHON_INCLUDE@
 
-SUBDIRS = rpm
+SUBDIRS = 
 
-EXTRA_DIST = system.h rpmdebug-py.c
+EXTRA_DIST = system.h rpmdebug-py.c rpm/__init__.py
 
 INCLUDES = -I. \
        -I$(top_srcdir)/build \
@@ -39,8 +39,9 @@ mylibs= \
 
 LDADD =
 
-rpmdir = $(prefix)/$(pylibdir)/site-packages/rpm
-rpm_LTLIBRARIES = _rpmmodule.la
+pyrpmdir = $(pylibdir)/rpm
+pyrpm_LTLIBRARIES = _rpmmodule.la
+pyrpm_SCRIPTS = rpm/__init__.py
 
 _rpmmodule_la_LDFLAGS = $(mylibs) $(LIBS) -module -avoid-version
 _rpmmodule_la_LIBADD =  @WITH_BEECRYPT_LIB@

diff --git a/python/rpm/Makefile.am b/python/rpm/Makefile.am
deleted file mode 100644 (file)
index 79e0948..0000000
--- a/python/rpm/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-# Makefile for rpm library
-
-AUTOMAKE_OPTIONS = 1.4 foreign
-
-PYVER = @WITH_PYTHON_VERSION@
-
-pylibdir = $(prefix)/@WITH_PYTHON_LIB@
-pyincdir = $(prefix)/@WITH_PYTHON_INCLUDE@
-
-EXTRA_DIST = \
-       __init__.py
-
-rpmdir = $(pylibdir)/site-packages/rpm
-rpm_SCRIPTS = \
-       __init__.py