diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2007-07-25 17:04:15 +0300 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2007-07-25 17:04:15 +0300 |
| commit | 48524d3b3303717c7d0455d8d58dd291f793f627 (patch) | |
| tree | 483345f14e1c865466cef5ee9eb9ea1201b6ef17 /python | |
| parent | f922a20f90726295efb4320b2611c14803fe966e (diff) | |
| download | rpm-48524d3b3303717c7d0455d8d58dd291f793f627.tar.gz rpm-48524d3b3303717c7d0455d8d58dd291f793f627.tar.bz2 rpm-48524d3b3303717c7d0455d8d58dd291f793f627.zip | |
Flatten python makefiles, path tweaks
Diffstat (limited to 'python')
| -rw-r--r-- | python/Makefile.am | 9 | ||||
| -rw-r--r-- | python/rpm/Makefile.am | 15 |
2 files changed, 5 insertions, 19 deletions
diff --git a/python/Makefile.am b/python/Makefile.am index ae67ec22c..642ccb4ee 100644 --- 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 index 79e0948ce..000000000 --- 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 |